logging: Fix creating empty file even when disabled (#2966)

KerfuffleV2 · staviq · web-flow · commit 3358c381f625 · 2023-09-02T11:53:55.000-06:00
* logging: Fix creating empty file even when disabled

* Minor formatting fix

Co-authored-by: staviq &lt;staviq@gmail.com&gt;

---------

Co-authored-by: staviq &lt;staviq@gmail.com&gt;
diff --git a/common/log.h b/common/log.h
@@ -341,14 +341,14 @@ inline FILE *log_handler1_impl(bool change = false, LogTriState disable = LogTri
         }
     }
 
-    if (_initialized)
+    if (_disabled)
     {
-        if (_disabled)
-        {
-            // Log is disabled
-            return nullptr;
-        }
+        // Log is disabled
+        return nullptr;
+    }
 
+    if (_initialized)
+    {
         // with fallback in case something went wrong
         return logfile ? logfile : stderr;
     }

Original file line number	Diff line number	Diff line change
`@@ -341,14 +341,14 @@ inline FILE *log_handler1_impl(bool change = false, LogTriState disable = LogTri`
`341`	`341`	`}`
`342`	`342`	`}`
`343`	`343`
`344`		`- if (_initialized)`
	`344`	`+ if (_disabled)`
`345`	`345`	`{`
`346`		`- if (_disabled)`
`347`		`- {`
`348`		`- // Log is disabled`
`349`		`- return nullptr;`
`350`		`- }`
	`346`	`+ // Log is disabled`
	`347`	`+ return nullptr;`
	`348`	`+ }`
`351`	`349`
	`350`	`+ if (_initialized)`
	`351`	`+ {`
`352`	`352`	`// with fallback in case something went wrong`
`353`	`353`	`return logfile ? logfile : stderr;`
`354`	`354`	`}`