[Scummvm-git-logs] scummvm branch-2-6 -> a872d80fd3521a179f23b586613d9115b6bb46bc

criezy noreply at scummvm.org
Thu Jun 23 23:42:51 UTC 2022


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:
a872d80fd3 AGS: Fixed restoring a exclusive fullscreen mode on switch in


Commit: a872d80fd3521a179f23b586613d9115b6bb46bc
    https://github.com/scummvm/scummvm/commit/a872d80fd3521a179f23b586613d9115b6bb46bc
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2022-06-24T00:03:54+01:00

Commit Message:
AGS: Fixed restoring a exclusive fullscreen mode on switch in

Fixed getting stuck in a render attempt loop, because the window
events are not being processed.

>From upstream 25329949f4d4a17ea8e6ad11fc7bd0ecccdfaca7

Changed paths:
    engines/ags/engine/ac/draw.cpp


diff --git a/engines/ags/engine/ac/draw.cpp b/engines/ags/engine/ac/draw.cpp
index bbe69d33a46..b598a3d1c82 100644
--- a/engines/ags/engine/ac/draw.cpp
+++ b/engines/ags/engine/ac/draw.cpp
@@ -696,7 +696,7 @@ void render_to_screen() {
 	_G(gfxDriver)->EnableVsyncBeforeRender((_GP(scsystem).vsync > 0) && (!_GP(scsystem).windowed));
 
 	bool succeeded = false;
-	while (!succeeded) {
+	while (!succeeded && !_G(want_exit) && !_G(abort_engine)) {
 		//     try
 		//     {
 		// For software renderer, need to blacken upper part of the game frame when shaking screen moves image down
@@ -715,9 +715,12 @@ void render_to_screen() {
 
 		succeeded = true;
 		/*}
-		catch (Ali3DFullscreenLostException)
-		{
-		    platform->Delay(500);
+		catch (Ali3DFullscreenLostException e) {
+			Debug::Printf("Renderer exception: %s", e._message);
+			while (_G(game_update_suspend) && (!_G(want_exit)) && (!_G(abort_engine))) {
+				sys_evt_process_pending();
+				platform->Delay(300);
+			}
 		}*/
 	}
 }




More information about the Scummvm-git-logs mailing list