debug: Prevent FATAL error from being overwritten in popup

Warzone2100 · Oct 31, 2023 · ff888e0 · ff888e0
1 parent ff7f04c
commit ff888e0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/lib/framework/debug.cpp b/lib/framework/debug.cpp
@@ -580,7 +580,7 @@ void _debug(int line, code_part part, const char *function, const char *str, ...
 		{
 			if (wzIsFullscreen())
 			{
-				wzChangeWindowMode(WINDOW_MODE::windowed);
+				wzChangeWindowMode(WINDOW_MODE::windowed, true);
 			}
 #if defined(WZ_OS_WIN)
 			char wbuf[MAX_LEN_LOG_LINE+512];

diff --git a/lib/framework/wzapp.h b/lib/framework/wzapp.h
@@ -86,7 +86,7 @@ WINDOW_MODE wzGetNextWindowMode(WINDOW_MODE currentMode);
 WINDOW_MODE wzAltEnterToggleFullscreen();
 bool wzSetToggleFullscreenMode(WINDOW_MODE fullscreenMode);
 WINDOW_MODE wzGetToggleFullscreenMode();
-bool wzChangeWindowMode(WINDOW_MODE mode);
+bool wzChangeWindowMode(WINDOW_MODE mode, bool silent = false);
 WINDOW_MODE wzGetCurrentWindowMode();
 bool wzIsFullscreen();
 void wzSetWindowIsResizable(bool resizable);

diff --git a/lib/sdl/main_sdl.cpp b/lib/sdl/main_sdl.cpp
@@ -676,7 +676,7 @@ WINDOW_MODE wzGetToggleFullscreenMode()
 	return altEnterToggleFullscreenMode;
 }
 
-bool wzChangeWindowMode(WINDOW_MODE mode)
+bool wzChangeWindowMode(WINDOW_MODE mode, bool silent)
 {
 	auto currMode = wzGetCurrentWindowMode();
 	if (currMode == mode)
@@ -691,7 +691,10 @@ bool wzChangeWindowMode(WINDOW_MODE mode)
 		return false;
 	}
 
-	debug(LOG_INFO, "Changing window mode: %s -> %s", to_display_string(currMode).c_str(), to_display_string(mode).c_str());
+	if (!silent)
+	{
+		debug(LOG_INFO, "Changing window mode: %s -> %s", to_display_string(currMode).c_str(), to_display_string(mode).c_str());
+	}
 
 	int sdl_result = -1;
 	switch (mode)