(trunk daemon) #2877 "Don't let the daemon launch if settings.json is corrupt" -- implemented in trunk for 1.90

This commit is contained in:
Charles Kerr
2010-02-07 22:17:42 +00:00
parent fb6ac30ca3
commit 0ea501355e
3 changed files with 65 additions and 53 deletions

View File

@@ -46,7 +46,7 @@
#include "version.h"
int messageLevel = 0;
int messageLevel = TR_MSG_INF;
static tr_lock * messageLock = NULL;
static tr_bool messageQueuing = FALSE;
static tr_msg_list * messageQueue = NULL;
@@ -284,7 +284,8 @@ tr_msg( const char * file, int line,
char buf[1024];
va_list ap;
tr_lockLock( messageLock );
if( messageLock != NULL )
tr_lockLock( messageLock );
/* build the text message */
*buf = '\0';
@@ -342,7 +343,9 @@ tr_msg( const char * file, int line,
}
}
tr_lockUnlock( messageLock );
if( messageLock != NULL )
tr_lockUnlock( messageLock );
errno = err;
}