[Scummvm-cvs-logs] SF.net SVN: scummvm:[39137] scummvm/trunk/engines/sci/sfx/player/polled.cpp

dhewg at users.sourceforge.net dhewg at users.sourceforge.net
Thu Mar 5 22:50:03 CET 2009


Revision: 39137
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39137&view=rev
Author:   dhewg
Date:     2009-03-05 21:50:01 +0000 (Thu, 05 Mar 2009)

Log Message:
-----------
don't crash if sound has been disabled or the backend driver failed to initialize.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sfx/player/polled.cpp

Modified: scummvm/trunk/engines/sci/sfx/player/polled.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/player/polled.cpp	2009-03-05 21:38:17 UTC (rev 39136)
+++ scummvm/trunk/engines/sci/sfx/player/polled.cpp	2009-03-05 21:50:01 UTC (rev 39137)
@@ -282,6 +282,9 @@
 }
 
 static int pp_init(ResourceManager *resmgr, int expected_latency) {
+	if (!g_system->getMixer()->isReady())
+		return SFX_ERROR;
+
 	Resource *res = NULL, *res2 = NULL;
 
 	/* FIXME Temporary hack to detect Amiga games. */


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