[Scummvm-cvs-logs] SF.net SVN: scummvm:[47231] scummvm/trunk/backends/events/default/ default-events.cpp
Hkz at users.sourceforge.net
Hkz at users.sourceforge.net
Sun Jan 10 18:49:05 CET 2010
Revision: 47231
http://scummvm.svn.sourceforge.net/scummvm/?rev=47231&view=rev
Author: Hkz
Date: 2010-01-10 17:49:05 +0000 (Sun, 10 Jan 2010)
Log Message:
-----------
Check if game engine is already paused before pausing it again to show virtual keyboard. Fixes #2912148
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 15:43:42 UTC (rev 47230)
+++ scummvm/trunk/backends/events/default/default-events.cpp 2010-01-10 17:49:05 UTC (rev 47231)
@@ -139,10 +139,14 @@
if (_vk->isDisplaying()) {
_vk->close(true);
} else {
- if (g_engine)
+ // Check if the engine is already paused before pausing it again
+ // Fixes #2912148. Where opening the GMM and then the virtual keyboard
+ // and then closing them left the game mute.
+ bool enginePaused = g_engine ? g_engine->isPaused() : true;
+ if (!enginePaused)
g_engine->pauseEngine(true);
_vk->show();
- if (g_engine)
+ if (!enginePaused)
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