[Scummvm-git-logs] scummvm master -> 9353b71de00dbd71c956cd1fc7a366ae09a3ac04

criezy criezy at scummvm.org
Thu Apr 22 01:56:23 UTC 2021


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:
9353b71de0 AGS: Fix crash in some games when quitting


Commit: 9353b71de00dbd71c956cd1fc7a366ae09a3ac04
    https://github.com/scummvm/scummvm/commit/9353b71de00dbd71c956cd1fc7a366ae09a3ac04
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-04-22T02:55:33+01:00

Commit Message:
AGS: Fix crash in some games when quitting

The crash occured in game_loop_do_late_update called from
UpdateGameOnce if a QUIT event was previously processed in
game_loop_check_controls.

Changed paths:
    engines/ags/engine/main/game_run.cpp


diff --git a/engines/ags/engine/main/game_run.cpp b/engines/ags/engine/main/game_run.cpp
index 35df3cc073..0197789696 100644
--- a/engines/ags/engine/main/game_run.cpp
+++ b/engines/ags/engine/main/game_run.cpp
@@ -726,6 +726,9 @@ void UpdateGameOnce(bool checkControls, IDriverDependantBitmap *extraBitmap, int
 
 	game_loop_check_controls(checkControls);
 
+	if (_G(abort_engine))
+		return;
+
 	_G(our_eip) = 2;
 
 	game_loop_do_update();




More information about the Scummvm-git-logs mailing list