cpmadevs/cnq3
0
0
Fork 0
mirror of https://bitbucket.org/CPMADevs/cnq3 synced 2025-01-22 08:21:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed the win32 dedicated server build

Browse source
This commit is contained in:
myT 2017-06-03 00:27:59 +02:00
parent 176f1ea09f
commit 59f658c791
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/win32/win_exception.cpp
View file

@ -250,9 +250,11 @@ static const char* WIN_GetAccessViolationCodeString( DWORD avCode )
} }
} }
#ifndef DEDICATED
// We save those separately because the handler might change related state before writing the report. // We save those separately because the handler might change related state before writing the report.
static qbool wasDevModeValid = qfalse; static qbool wasDevModeValid = qfalse;
static qbool wasMinimized = qfalse; static qbool wasMinimized = qfalse;
#endif
static void WIN_WriteTextData( const char* filePath, debug_help_t* debugHelp, EXCEPTION_RECORD* pExceptionRecord ) static void WIN_WriteTextData( const char* filePath, debug_help_t* debugHelp, EXCEPTION_RECORD* pExceptionRecord )
{ {
@ -278,8 +280,10 @@ static void WIN_WriteTextData( const char* filePath, debug_help_t* debugHelp, EX
JSONW_StringValue("windows_version", "%d.%d.%d", osVersion[0], osVersion[1], osVersion[2]); JSONW_StringValue("windows_version", "%d.%d.%d", osVersion[0], osVersion[1], osVersion[2]);
} }
#ifndef DEDICATED
JSONW_BooleanValue("device_mode_changed", wasDevModeValid); JSONW_BooleanValue("device_mode_changed", wasDevModeValid);
JSONW_BooleanValue("minimized", wasMinimized); JSONW_BooleanValue("minimized", wasMinimized);
#endif
Crash_PrintToFile(__argv[0]); Crash_PrintToFile(__argv[0]);
@ -471,6 +475,7 @@ LONG CALLBACK WIN_HandleException( EXCEPTION_POINTERS* ep )
if (IsDebuggerPresent() && WIN_WouldDebuggingBeOkay()) if (IsDebuggerPresent() && WIN_WouldDebuggingBeOkay())
return EXCEPTION_CONTINUE_SEARCH; return EXCEPTION_CONTINUE_SEARCH;
#ifndef DEDICATED
__try { __try {
wasDevModeValid = glw_state.cdsDevModeValid; wasDevModeValid = glw_state.cdsDevModeValid;
if (glw_state.cdsDevModeValid) if (glw_state.cdsDevModeValid)
@ -486,6 +491,7 @@ LONG CALLBACK WIN_HandleException( EXCEPTION_POINTERS* ep )
ShowWindow(g_wv.hWnd, SW_MINIMIZE); ShowWindow(g_wv.hWnd, SW_MINIMIZE);
} __except(EXCEPTION_EXECUTE_HANDLER) {} } __except(EXCEPTION_EXECUTE_HANDLER) {}
} }
#endif
if (exc_exitCalled || IsDebuggerPresent()) if (exc_exitCalled || IsDebuggerPresent())
return EXCEPTION_CONTINUE_SEARCH; return EXCEPTION_CONTINUE_SEARCH;