[Scummvm-cvs-logs] SF.net SVN: scummvm:[47234] scummvm/trunk/backends/events/default/ default-events.cpp

Hkz at users.sourceforge.net Hkz at users.sourceforge.net
Sun Jan 10 19:11:36 CET 2010


Revision: 47234
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47234&view=rev
Author:   Hkz
Date:     2010-01-10 18:11:36 +0000 (Sun, 10 Jan 2010)

Log Message:
-----------
remove unneeded workaround for #47233

Modified Paths:
--------------
    scummvm/trunk/backends/events/default/default-events.cpp

Modified: scummvm/trunk/backends/events/default/default-events.cpp
===================================================================
--- scummvm/trunk/backends/events/default/default-events.cpp	2010-01-10 18:09:49 UTC (rev 47233)
+++ scummvm/trunk/backends/events/default/default-events.cpp	2010-01-10 18:11:36 UTC (rev 47234)
@@ -139,15 +139,10 @@
 				if (_vk->isDisplaying()) {
 					_vk->close(true);
 				} else {
-					// Check if the engine is already paused before pausing it again
-					// Workaround for #2912148. Where opening the GMM and then the virtual keyboard
-					// and then closing them left the game mute.
-					// FIXME: Engines should really allow recursive pausing.
-					bool enginePaused = g_engine ? g_engine->isPaused() : true;
-					if (!enginePaused)
+					if (g_engine)
 						g_engine->pauseEngine(true);
 					_vk->show();
-					if (!enginePaused)
+					if (g_engine)
 						g_engine->pauseEngine(false);
 					result = false;
 				}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list