[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.320.2.3,1.320.2.4

[Travis Howell]

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

Modified Files:
      Tag: branch-0-6-0
	sound.cpp 
Log Message:

Delay only required when using subtitles


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.320.2.3
retrieving revision 1.320.2.4
diff -u -d -r1.320.2.3 -r1.320.2.4
--- sound.cpp	17 Apr 2004 07:26:28 -0000	1.320.2.3
+++ sound.cpp	28 Jun 2004 09:28:58 -0000	1.320.2.4
@@ -450,7 +450,7 @@
 			}
 		}
 
-		if (finished && _vm->_talkDelay == 0) {
+		if ((!ConfMan.getBool("subtitles") && finished) || (finished && _vm->_talkDelay == 0)) {
 			_vm->stopTalk();
 		}
 	}