Skip to content

fix(headless): Set DX8Wrapper_IsWindowed to false to suppress assertion dialogs during shutdown #2298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 5 commits into from
Mar 24, 2026
Merged

fix(headless): Set DX8Wrapper_IsWindowed to false to suppress assertion dialogs during shutdown #2298

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6826644
fix(headless): Set DX8Wrapper_IsWindowed to false in headless mode to…
bobtista Feb 3, 2026
4234101
Add braces around else-if body for style consistency
bobtista Feb 9, 2026
3d8ef9e
nit: date format in comment
bobtista Feb 24, 2026
3e96876
Move DX8Wrapper_IsWindowed headless fix into parseHeadless function
bobtista Feb 27, 2026
bb6b804
Replicate headless DX8Wrapper_IsWindowed fix to Generals
bobtista Mar 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion GeneralsMD/Code/Main/WinMain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,8 +875,18 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
#endif

// register windows class and create application window
if(!TheGlobalData->m_headless && initializeAppWindows(hInstance, nCmdShow, TheGlobalData->m_windowed) == 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.
if (TheGlobalData->m_headless)
{
extern bool DX8Wrapper_IsWindowed;
DX8Wrapper_IsWindowed = false;
Comment thread
bobtista marked this conversation as resolved.
Outdated
}
else if (initializeAppWindows(hInstance, nCmdShow, TheGlobalData->m_windowed) == false)
{
return exitcode;
}

// save our application instance for future use
ApplicationHInstance = hInstance;
Expand Down
Loading