[Scummvm-git-logs] scummvm master -> 63af61b1cc2cee59a925bbe3b6d38f528c2921c9

sev- noreply at scummvm.org
Thu Mar 2 00:28:36 UTC 2023


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
63af61b1cc GLK: SCOTT: Fix assert failed after calling Scott::fatal()


Commit: 63af61b1cc2cee59a925bbe3b6d38f528c2921c9
    https://github.com/scummvm/scummvm/commit/63af61b1cc2cee59a925bbe3b6d38f528c2921c9
Author: Harishankar Kumar (31770598+hari01584 at users.noreply.github.com)
Date: 2023-03-02T01:28:31+01:00

Commit Message:
GLK: SCOTT: Fix assert failed after calling Scott::fatal()

Changed paths:
    engines/glk/scott/scott.cpp


diff --git a/engines/glk/scott/scott.cpp b/engines/glk/scott/scott.cpp
index eb66cd9e37c..a025214e237 100644
--- a/engines/glk/scott/scott.cpp
+++ b/engines/glk/scott/scott.cpp
@@ -140,7 +140,8 @@ void Scott::runGame() {
 	// Check for savegame
 	_saveSlot = ConfMan.hasKey("save_slot") ? ConfMan.getInt("save_slot") : -1;
 
-	_G(_initialState) = saveCurrentState();
+	if (!shouldQuit())
+		_G(_initialState) = saveCurrentState();
 
 	while (!shouldQuit()) {
 		glk_tick();




More information about the Scummvm-git-logs mailing list