[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.544,1.545

[Torbjörn Andersson]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15173/scumm

Modified Files:
	scumm.cpp 
Log Message:
Applied patch #1208299. A warning message about the "playing from CD under
Windows" bug is better than nothing, even if a proper bugfix - if one is
possible - would be preferable.


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.544
retrieving revision 1.545
diff -u -d -r1.544 -r1.545
--- scumm.cpp	14 Jun 2005 03:06:55 -0000	1.544
+++ scumm.cpp	14 Jun 2005 08:54:11 -0000	1.545
@@ -1461,6 +1461,10 @@
 
 	_system->endGFXTransaction();
 
+	// On some systems it's not safe to run CD audio games from the CD.
+	if (_features & GF_AUDIOTRACKS)
+		checkCD();
+
 	int cd_num = ConfMan.getInt("cdrom");
 	if (cd_num >= 0 && (_features & GF_AUDIOTRACKS))
 		_system->openCD(cd_num);