Skip to content

Commit 53b2ca8

Browse files
committed
Got rid of extra popup if you abort in an activity that doesn't allow saving (or no activity)
Also tweaked abort message about saving since it'll only show if the game managed to make an abort save
1 parent ad8c6b8 commit 53b2ca8

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

System/RTEError.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ namespace RTE {
3232

3333
if (!System::IsInExternalModuleValidationMode()) {
3434
// Attempt to save the game itself, so the player can hopefully resume where they were.
35-
bool abortSaveMade = g_ActivityMan.SaveCurrentGame("AbortSave");
35+
bool abortSaveMade = false;
36+
if (g_ActivityMan.GetActivityAllowsSaving()) {
37+
abortSaveMade = g_ActivityMan.SaveCurrentGame("AbortSave");
38+
}
3639

3740
// Save out the screen bitmap, after making a copy of it, faster sometimes.
3841
if (screen) {
@@ -55,7 +58,7 @@ namespace RTE {
5558

5659
std::string abortMessage = "Runtime Error in file '" + fileName + "', line " + std::to_string(line) + ", because:\n\n" + description + "\n\n";
5760
if (abortSaveMade) {
58-
abortMessage += "The game has attempted to save to 'AbortSave'.\n";
61+
abortMessage += "The game has saved to 'AbortSave'.\n";
5962
}
6063
abortMessage += "The console has been dumped to 'AbortLog.txt'.\nThe last frame has been dumped to 'AbortScreen.bmp'.";
6164

0 commit comments

Comments
 (0)