[Scummvm-cvs-logs] SF.net SVN: scummvm:[47639] scummvm/trunk/engines/sci/console.cpp

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Thu Jan 28 11:31:39 CET 2010


Revision: 47639
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47639&view=rev
Author:   thebluegr
Date:     2010-01-28 10:31:37 +0000 (Thu, 28 Jan 2010)

Log Message:
-----------
Don't attempt to pause/resume sounds when the debug console opens if the sound subsystem hasn't been initialized yet

Modified Paths:
--------------
    scummvm/trunk/engines/sci/console.cpp

Modified: scummvm/trunk/engines/sci/console.cpp
===================================================================
--- scummvm/trunk/engines/sci/console.cpp	2010-01-28 10:08:54 UTC (rev 47638)
+++ scummvm/trunk/engines/sci/console.cpp	2010-01-28 10:31:37 UTC (rev 47639)
@@ -201,7 +201,8 @@
 	if (_vm->_gamestate)
 		_vm->_gamestate->_sound.sfx_suspend(true);
 #endif
-	_vm->getEngineState()->_soundCmd->pauseAll(true);
+	if (_vm->getEngineState() && _vm->getEngineState()->_soundCmd)
+		_vm->getEngineState()->_soundCmd->pauseAll(true);
 }
 
 void Console::postEnter() {
@@ -209,7 +210,8 @@
 	if (_vm->_gamestate)
 		_vm->_gamestate->_sound.sfx_suspend(false);
 #endif
-	_vm->getEngineState()->_soundCmd->pauseAll(false);
+	if (_vm->getEngineState() && _vm->getEngineState()->_soundCmd)
+		_vm->getEngineState()->_soundCmd->pauseAll(false);
 
 	if (!_videoFile.empty()) {
 		_vm->_gamestate->_gui->hideCursor();


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