[Scummvm-cvs-logs] scummvm master -> 10c308f5575819ec9f6f6ae5080e517a43027c05
dreammaster
dreammaster at scummvm.org
Sat Jun 4 09:32:46 CEST 2011
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:
10c308f557 TSAGE: Bugfix for assert when quitting whilst inventory dialog active
Commit: 10c308f5575819ec9f6f6ae5080e517a43027c05
https://github.com/scummvm/scummvm/commit/10c308f5575819ec9f6f6ae5080e517a43027c05
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-06-04T00:31:08-07:00
Commit Message:
TSAGE: Bugfix for assert when quitting whilst inventory dialog active
Changed paths:
engines/tsage/dialogs.cpp
diff --git a/engines/tsage/dialogs.cpp b/engines/tsage/dialogs.cpp
index de24119..c1bd1d0 100644
--- a/engines/tsage/dialogs.cpp
+++ b/engines/tsage/dialogs.cpp
@@ -473,7 +473,7 @@ void InventoryDialog::execute() {
g_system->updateScreen();
}
if (_vm->getEventManager()->shouldQuit())
- return;
+ break;
hiliteObj = NULL;
if ((event.eventType == EVENT_BUTTON_DOWN) && !_bounds.contains(event.mousePos))
More information about the Scummvm-git-logs
mailing list