Move DX8Wrapper_IsWindowed headless fix into parseHeadless function

Author: bobtista

GeneralsMD/Code/GameEngine/Source/Common/CommandLine.cpp

@@ -414,6 +414,13 @@ Int parseHeadless(char *args[], int num)
 	TheWritableGlobalData->m_playIntro = FALSE;
 	TheWritableGlobalData->m_afterIntro = TRUE;
 	TheWritableGlobalData->m_playSizzle = FALSE;
+
+	// TheSuperHackers @fix bobtista 03/02/2026 Set DX8Wrapper_IsWindowed to false in headless
+	// mode so that ignoringAsserts() works correctly throughout the entire process lifetime,
+	// including during shutdown after TheGlobalData has been destroyed.
+	extern bool DX8Wrapper_IsWindowed;
+	DX8Wrapper_IsWindowed = false;
+
 	return 1;
 }
 

GeneralsMD/Code/Main/WinMain.cpp

@@ -875,18 +875,8 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 #endif
 
 		// register windows class and create application window
-		// TheSuperHackers @fix bobtista 03/02/2026 Set DX8Wrapper_IsWindowed to false in headless
-		// mode so that ignoringAsserts() works correctly throughout the entire process lifetime,
-		// including during shutdown after TheGlobalData has been destroyed.
-		if (TheGlobalData->m_headless)
-		{
-			extern bool DX8Wrapper_IsWindowed;
-			DX8Wrapper_IsWindowed = false;
-		}
-		else if (initializeAppWindows(hInstance, nCmdShow, TheGlobalData->m_windowed) == false)
-		{
+		if(!TheGlobalData->m_headless && initializeAppWindows(hInstance, nCmdShow, TheGlobalData->m_windowed) == false)
 			return exitcode;
-		}
 
 		// save our application instance for future use
 		ApplicationHInstance = hInstance;