Merge pull request #645 from pbtoast/prefs-circ-deps-485

Simple fix for crash related to circular dependencies in local pref path.
This commit is contained in:
Timothee "TTimo" Besset 2019-11-02 16:20:46 -05:00 committed by GitHub
commit 1f6d29eac8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -111,6 +111,9 @@ void Error( const char *error, ... ){
}
}
// If a game has been selected in the global preferences, we can let
// the player edit that game's preferences to try to get it to work.
if (g_PrefsDlg.m_bSetGame) {
strcat( text, _( "An unrecoverable error has occured.\n"
"Would you like to edit Preferences before exiting Radiant?" ) );
@ -121,6 +124,12 @@ void Error( const char *error, ... ){
g_PrefsDlg.LoadPrefs();
g_PrefsDlg.DoModal();
}
}
else {
strcat( text, _( "An unrecoverable error has occured." ) );
Sys_Printf( text );
gtk_MessageBox( NULL, text, _( "Error" ), MB_ICONEXCLAMATION );
}
QGL_Shutdown();