mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-17 21:51:17 +02:00
Code Issues Projects Releases Wiki Activity

- added Unit selection type label

Browse Source 
- updated unhandled exception logic in linux
This commit is contained in:
Mark Vejvoda
2013-02-01 05:52:00 +00:00
parent 3ccdd1a0c7
commit d808b4ecc4
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mk/cmake/Modules/FindGoogleBreakpad.cmake
View File

@@ -12,6 +12,8 @@
SET(BREAKPAD_OS "linux") SET(BREAKPAD_OS "linux")
IF(WIN32) IF(WIN32)
SET(BREAKPAD_OS "windows") SET(BREAKPAD_OS "windows")
ELSEIF(APPLE)
SET(BREAKPAD_OS "mac")
ENDIF() ENDIF()
FIND_PATH(BREAKPAD_INCLUDE_DIR FIND_PATH(BREAKPAD_INCLUDE_DIR

23
source/glest_game/main/main.cpp
View File

@@ -284,7 +284,9 @@ void fatal(const char *s, ...) // failure exit
LPWSTR wstr = Ansi2WideString(errText.c_str()); LPWSTR wstr = Ansi2WideString(errText.c_str());
LPWSTR wstr1 = Ansi2WideString(sErr.c_str()); LPWSTR wstr1 = Ansi2WideString(sErr.c_str());
MessageBox(NULL, wstr, wstr1, MB_OK|MB_SYSTEMMODAL); if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == false) {
MessageBox(NULL, wstr, wstr1, MB_OK|MB_SYSTEMMODAL);
}
delete [] wstr; delete [] wstr;
delete [] wstr1; delete [] wstr1;
@@ -5189,10 +5191,12 @@ static bool MinidumpCallback(const wchar_t *dump_path,
bool succeeded) { bool succeeded) {
printf("\n======= In MinidumpCallback...\n"); printf("\n======= In MinidumpCallback...\n");
wprintf(L"\n***ERROR details captured:\nCrash minidump folder: %s\nfile: %s.dmp\nSucceeded: %d\n", (dump_path != NULL ? dump_path : L"(null)"),(minidump_id != NULL ? minidump_id : L"(null)"),succeeded); wprintf(L"\n***ERROR details captured:\nCrash minidump folder: %s\nfile: %s.dmp\nSucceeded: %d\n", (dump_path != NULL ? dump_path : L"(null)"),(minidump_id != NULL ? minidump_id : L"(null)"),succeeded);
wchar_t szBuf[8096]; if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == false) {
_snwprintf(szBuf,8096,L"An unhandled error was detected.\n\nA crash dump file has been created in the folder:\n%s\nCrash dump filename is: %s.dmp",dump_path,minidump_id); wchar_t szBuf[8096];
MessageBox(NULL, szBuf, L"Unhandled error", MB_OK|MB_SYSTEMMODAL); _snwprintf(szBuf,8096,L"An unhandled error was detected.\n\nA crash dump file has been created in the folder:\n%s\nCrash dump filename is: %s.dmp",dump_path,minidump_id);
MessageBox(NULL, szBuf, L"Unhandled error", MB_OK|MB_SYSTEMMODAL);
}
return succeeded; return succeeded;
} }
@@ -5206,9 +5210,12 @@ static bool MinidumpCallback(const google_breakpad::MinidumpDescriptor& descript
printf("\n======= In MinidumpCallback...\n"); printf("\n======= In MinidumpCallback...\n");
printf("\n***ERROR details captured:\nCrash minidump folder: %s\nfile: %s\nSucceeded: %d\n", descriptor.directory().c_str(),descriptor.path(),succeeded); printf("\n***ERROR details captured:\nCrash minidump folder: %s\nfile: %s\nSucceeded: %d\n", descriptor.directory().c_str(),descriptor.path(),succeeded);
char szBuf[8096]; if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == false) {
snprintf(szBuf,8096,"An unhandled error was detected.\n\nA crash dump file has been created in the folder:\n%s\nCrash dump filename is: %s.dmp",descriptor.directory().c_str(),descriptor.path()); char szBuf[8096];
//MessageBox(NULL, szBuf, "Unhandled error", MB_OK|MB_SYSTEMMODAL); snprintf(szBuf,8096,"An unhandled error was detected.\n\nA crash dump file has been created in the folder:\n%s\nCrash dump filename is: %s.dmp",descriptor.directory().c_str(),descriptor.path());
//MessageBox(NULL, szBuf, "Unhandled error", MB_OK|MB_SYSTEMMODAL);
message(szBuf);
}
return succeeded; return succeeded;
} }