# HG changeset patch # User Matti Hamalainen # Date 1352737928 -7200 # Node ID 89fafb2183967d7083bc60b3e4d31ee5eafaca57 # Parent 504a8b9297a3a4473c86ef9dc7db672832c59492 Fix situations where the log path is unset. diff -r 504a8b9297a3 -r 89fafb218396 main.c --- a/main.c Mon Nov 12 14:30:59 2012 +0200 +++ b/main.c Mon Nov 12 18:32:08 2012 +0200 @@ -1511,9 +1511,6 @@ if (!optLogEnable) return FALSE; - th_free(win->logFilename); - win->logFilename = NULL; - if (optLogPath != NULL) { char *lt = strrchr(optLogPath, SET_DIR_SEPARATOR); @@ -1526,7 +1523,7 @@ if (win->id == NULL) { win->logFilename = th_strdup_printf("%sroom_%d%s", - path, optPort, optLogExtension); + path != NULL ? path : "", optPort, optLogExtension); } else { @@ -1542,7 +1539,9 @@ cleaned[pos] = '_'; } - win->logFilename = th_strdup_printf("%s%s%s", path, cleaned, optLogExtension); + win->logFilename = th_strdup_printf("%s%s%s", + path != NULL ? path : "", cleaned, optLogExtension); + th_free(cleaned); }