matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add ability to disable blue screens

Browse Source 
This will let us produce crash dumps on user machines.
This commit is contained in:
Tamás Bálint Misius 2022-12-30 08:21:02 +01:00
parent 2bcf32e2cf
commit 1da7438e39
No known key found for this signature in database
GPG Key ID: 5B472A12F6ECA9F2
1 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/PowderToySDL.cpp
View File

@ -309,6 +309,7 @@ std::map<ByteString, ByteString> readArguments(int argc, char * argv[])
arguments["sound"] = "false";
arguments["kiosk"] = "false";
arguments["redirect"] = "false";
arguments["nobluescreen"] = "false";
arguments["scripts"] = "false";
arguments["open"] = "";
arguments["ddir"] = "";
@ -353,6 +354,10 @@ std::map<ByteString, ByteString> readArguments(int argc, char * argv[])
{
arguments["redirect"] = "true";
}
else if (!strncmp(argv[i], "nobluescreen", 12))
{
arguments["nobluescreen"] = "true";
}
else if (!strncmp(argv[i], "sound", 5))
{
arguments["sound"] = "true";
@ -866,11 +871,19 @@ int main(int argc, char * argv[])
engine->SetFastQuit(Client::Ref().GetPrefBool("FastQuit", true));
#if !defined(DEBUG)
bool enableBluescreen = true;
if(arguments["nobluescreen"] == "true")
{
enableBluescreen = false;
}
if (enableBluescreen)
{
//Get ready to catch any dodgy errors
signal(SIGSEGV, SigHandler);
signal(SIGFPE, SigHandler);
signal(SIGILL, SigHandler);
signal(SIGABRT, SigHandler);
}
#endif
#ifdef X86_SSE
@ -881,10 +894,8 @@ int main(int argc, char * argv[])
#endif
GameController * gameController = NULL;
#if !defined(DEBUG)
try {
#endif
auto wrapWithBluescreen = [&]() {
gameController = new GameController();
engine->ShowWindow(gameController->GetView());
@ -970,14 +981,23 @@ int main(int argc, char * argv[])
EngineProcess();
SaveWindowPosition();
};
#if !defined(DEBUG)
if (enableBluescreen)
{
try
{
wrapWithBluescreen();
}
catch(std::exception& e)
catch (const std::exception &e)
{
BlueScreen(ByteString(e.what()).FromUtf8());
}
}
else
#endif
wrapWithBluescreen(); // the else branch of the if in the #if !defined(DEBUG)
ui::Engine::Ref().CloseWindow();
delete gameController;