- cleanup SDL fatal error reporting

Output error text to terminal if SDL message box cannot be shown
Removed wrong "No IWAD found" message
This commit is contained in:
alexey.lysiuk 2019-10-11 12:03:23 +03:00 committed by drfrag
parent ad07c6fcdb
commit 14b07ee45f

View file

@ -131,9 +131,8 @@ void Linux_I_FatalError(const char* errortext)
if((str=getenv("KDE_FULL_SESSION")) && strcmp(str, "true") == 0) if((str=getenv("KDE_FULL_SESSION")) && strcmp(str, "true") == 0)
{ {
FString cmd; FString cmd;
cmd << "kdialog --title \"" GAMESIG " "; cmd << "kdialog --title \"" GAMESIG " " << GetVersionString()
cmd << GetVersionString() << ": No IWAD found\" "; << "\" --msgbox \"" << errortext << "\"";
cmd << "--msgbox \"" << errortext << "\"";
popen(cmd, "r"); popen(cmd, "r");
} }
#ifndef NO_GTK #ifndef NO_GTK
@ -144,10 +143,13 @@ void Linux_I_FatalError(const char* errortext)
#endif #endif
else else
{ {
FString message; FString title;
message << GAMESIG " "; title << GAMESIG " " << GetVersionString();
message << GetVersionString() << ": No IWAD found";
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, message, errortext, NULL); if (SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, title, errortext, NULL) < 0)
{
printf("\n%s\n", errortext);
}
} }
} }
#endif #endif