[Scummvm-git-logs] scummvm master -> 468b01c25b35bd51bc83e19c23c156678c0cf478
neuromancer
noreply at scummvm.org
Wed Nov 4 08:04:50 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:
468b01c25b HOLLYWOOD: do not repeatedly queued shutdown events
Commit: 468b01c25b35bd51bc83e19c23c156678c0cf478
https://github.com/scummvm/scummvm/commit/468b01c25b35bd51bc83e19c23c156678c0cf478
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-11-04T09:02:44+01:00
Commit Message:
HOLLYWOOD: do not repeatedly queued shutdown events
Changed paths:
engines/hollywood/monsters/gameplay/options_menu.cpp
engines/hollywood/monsters/gameplay/travel_screen.cpp
engines/hollywood/monsters/scenes/playable/scene2050.cpp
diff --git a/engines/hollywood/monsters/gameplay/options_menu.cpp b/engines/hollywood/monsters/gameplay/options_menu.cpp
index 88601e90247..dd00dc2885e 100644
--- a/engines/hollywood/monsters/gameplay/options_menu.cpp
+++ b/engines/hollywood/monsters/gameplay/options_menu.cpp
@@ -280,9 +280,8 @@ void GameplayOptionsMenu::pollEvents(bool &done) {
switch (event.type) {
case Common::EVENT_QUIT:
case Common::EVENT_RETURN_TO_LAUNCHER:
- Engine::quitGame();
done = true;
- break;
+ return;
case Common::EVENT_MOUSEMOVE:
_vm->cursor()->updatePosition(event.mouse);
break;
diff --git a/engines/hollywood/monsters/gameplay/travel_screen.cpp b/engines/hollywood/monsters/gameplay/travel_screen.cpp
index 947f3a51186..6320b41931e 100644
--- a/engines/hollywood/monsters/gameplay/travel_screen.cpp
+++ b/engines/hollywood/monsters/gameplay/travel_screen.cpp
@@ -93,7 +93,6 @@ bool TravelScreen::showViewer() {
switch (event.type) {
case Common::EVENT_QUIT:
case Common::EVENT_RETURN_TO_LAUNCHER:
- Engine::quitGame();
return true;
case Common::EVENT_MAINMENU:
_vm->openMainMenuDialog();
@@ -136,8 +135,7 @@ bool TravelScreen::showUnlockTransition(byte slotIndex) {
switch (event.type) {
case Common::EVENT_QUIT:
case Common::EVENT_RETURN_TO_LAUNCHER:
- Engine::quitGame();
- break;
+ return true;
case Common::EVENT_MAINMENU:
_vm->openMainMenuDialog();
if (_vm->isSceneRestartRequested())
@@ -179,8 +177,8 @@ bool TravelScreen::runSelection(byte currentChapterId, uint16 &selectedStateId)
switch (event.type) {
case Common::EVENT_QUIT:
case Common::EVENT_RETURN_TO_LAUNCHER:
- Engine::quitGame();
- break;
+ _vm->cursor()->leaveInteractiveMode();
+ return true;
case Common::EVENT_MAINMENU:
_vm->openMainMenuDialog();
if (_vm->isSceneRestartRequested()) {
diff --git a/engines/hollywood/monsters/scenes/playable/scene2050.cpp b/engines/hollywood/monsters/scenes/playable/scene2050.cpp
index 9fff6cb01e6..a76f5c26afe 100644
--- a/engines/hollywood/monsters/scenes/playable/scene2050.cpp
+++ b/engines/hollywood/monsters/scenes/playable/scene2050.cpp
@@ -486,11 +486,10 @@ void Scene2050::runMuralPuzzleSubscreen() {
}
Common::Event event;
- while (g_system->getEventManager()->pollEvent(event)) {
+ while (!done && g_system->getEventManager()->pollEvent(event)) {
switch (event.type) {
case Common::EVENT_QUIT:
case Common::EVENT_RETURN_TO_LAUNCHER:
- Engine::quitGame();
done = true;
break;
case Common::EVENT_MAINMENU:
More information about the Scummvm-git-logs
mailing list