[Scummvm-git-logs] scummvm master -> ce48271a59e7450df8a4f9853a65582e8d54bc64
dreammaster
dreammaster at scummvm.org
Sun Feb 25 04:02:54 CET 2018
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:
ce48271a59 XEEN: Fix freeze on the Confirm dialog
Commit: ce48271a59e7450df8a4f9853a65582e8d54bc64
https://github.com/scummvm/scummvm/commit/ce48271a59e7450df8a4f9853a65582e8d54bc64
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-02-24T22:02:48-05:00
Commit Message:
XEEN: Fix freeze on the Confirm dialog
Changed paths:
engines/xeen/dialogs_query.cpp
diff --git a/engines/xeen/dialogs_query.cpp b/engines/xeen/dialogs_query.cpp
index 75de3ee..5fbf35f 100644
--- a/engines/xeen/dialogs_query.cpp
+++ b/engines/xeen/dialogs_query.cpp
@@ -37,7 +37,6 @@ bool Confirm::execute(const Common::String &msg, int mode) {
EventsManager &events = *_vm->_events;
Windows &windows = *_vm->_windows;
SpriteResource confirmSprites;
- bool result = false;
confirmSprites.load("confirm.icn");
addButton(Common::Rect(129, 112, 153, 122), Common::KEYCODE_y, &confirmSprites);
@@ -66,11 +65,11 @@ bool Confirm::execute(const Common::String &msg, int mode) {
w.update();
events.clearEvents();
+ bool result = false;
+
while (!_vm->shouldExit()) {
- while (!_vm->shouldExit() && !_buttonValue) {
- events.pollEvents();
- checkEvents(_vm);
- }
+ events.pollEvents();
+ checkEvents(_vm);
if ((mode & 0x80) || _buttonValue == Common::KEYCODE_ESCAPE
|| _buttonValue == Common::KEYCODE_n)
More information about the Scummvm-git-logs
mailing list