[Scummvm-cvs-logs] scummvm master -> 2942f93ed5c884fdd3843ff56b6a2688fdb780dc

dreammaster dreammaster at scummvm.org
Sat Sep 6 03:40:25 CEST 2014


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:
2942f93ed5 MADS: Fix exiting the game


Commit: 2942f93ed5c884fdd3843ff56b6a2688fdb780dc
    https://github.com/scummvm/scummvm/commit/2942f93ed5c884fdd3843ff56b6a2688fdb780dc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-09-05T21:39:10-04:00

Commit Message:
MADS: Fix exiting the game

Changed paths:
    engines/mads/mads.cpp
    engines/mads/nebular/menu_nebular.cpp



diff --git a/engines/mads/mads.cpp b/engines/mads/mads.cpp
index 59eec40..6c1b436 100644
--- a/engines/mads/mads.cpp
+++ b/engines/mads/mads.cpp
@@ -103,9 +103,6 @@ Common::Error MADSEngine::run() {
 	// Run the game
 	_game->run();
 
-	// Dummy loop to keep application active
-	_events->delay(9999);
-
 	return Common::kNoError;
 }
 
diff --git a/engines/mads/nebular/menu_nebular.cpp b/engines/mads/nebular/menu_nebular.cpp
index 05d1954..e29e9ff 100644
--- a/engines/mads/nebular/menu_nebular.cpp
+++ b/engines/mads/nebular/menu_nebular.cpp
@@ -405,6 +405,7 @@ void AdvertView::show() {
 
 	events.setEventTarget(nullptr);
 	_vm->quitGame();
+	events.pollEvents();
 }
 
 bool AdvertView::onEvent(Common::Event &event) {






More information about the Scummvm-git-logs mailing list