[Scummvm-git-logs] scummvm master -> d46ea6cee6959d886b9e71d7b9952c1cbda73d7d

lephilousophe noreply at scummvm.org
Mon Aug 24 14:05:06 UTC 2026


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

Summary:
d46ea6cee6 GUI: Remove leftover check


Commit: d46ea6cee6959d886b9e71d7b9952c1cbda73d7d
    https://github.com/scummvm/scummvm/commit/d46ea6cee6959d886b9e71d7b9952c1cbda73d7d
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2026-08-24T15:39:31+02:00

Commit Message:
GUI: Remove leftover check

getTopDialog will return nullptr if there is no dialog in the stack while
activeDialog cannot be nullptr.
Since 854826756cbb, this check can also lead to issues as the tooltip is
never on the stack.

This may fix the issues met in PR #7863 and is confirmed by the analysis
of ChatGPT-5.6-sol posted in the issue by @fusefib.

Changed paths:
    gui/gui-manager.cpp


diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp
index d7f4dd03205..f78e95c72b4 100644
--- a/gui/gui-manager.cpp
+++ b/gui/gui-manager.cpp
@@ -612,7 +612,7 @@ void GuiManager::runLoop() {
 	Common::EventManager *eventMan = _system->getEventManager();
 	const uint32 targetFrameDuration = 1000 / 60;
 
-	while (!_dialogStack.empty() && activeDialog == getTopDialog() && !eventMan->shouldQuit() && (!g_engine || !eventMan->shouldReturnToLauncher())) {
+	while (activeDialog == getTopDialog() && !eventMan->shouldQuit() && (!g_engine || !eventMan->shouldReturnToLauncher())) {
 		uint32 frameStartTime = _system->getMillis(true);
 
 		// Don't "tickle" the dialog until the theme has had a chance




More information about the Scummvm-git-logs mailing list