[Scummvm-cvs-logs] SF.net SVN: scummvm:[47235] scummvm/branches/branch-1-0-0/engines/engine. cpp

[lordhoto at users.sourceforge.net]

Revision: 47235
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47235&view=rev
Author:   lordhoto
Date:     2010-01-10 18:12:14 +0000 (Sun, 10 Jan 2010)

Log Message:
-----------
Backport of r47233: "Fix bug in Engine::pauseEngine".

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/engine.cpp

Modified: scummvm/branches/branch-1-0-0/engines/engine.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/engine.cpp	2010-01-10 18:11:36 UTC (rev 47234)
+++ scummvm/branches/branch-1-0-0/engines/engine.cpp	2010-01-10 18:12:14 UTC (rev 47235)
@@ -270,7 +270,7 @@
 	else
 		_pauseLevel--;
 
-	if (_pauseLevel == 1) {
+	if (_pauseLevel == 1 && pause) {
 		pauseEngineIntern(true);
 	} else if (_pauseLevel == 0) {
 		pauseEngineIntern(false);


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