[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.143,1.144
Max Horn
fingolfin at users.sourceforge.net
Sun Jan 16 05:33:31 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7598
Modified Files:
smush_player.cpp
Log Message:
Cosmetic change, avoiding a hypothetical threading problem, see bug #1098864
Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- smush_player.cpp 10 Jan 2005 22:06:10 -0000 1.143
+++ smush_player.cpp 16 Jan 2005 13:32:48 -0000 1.144
@@ -257,8 +257,7 @@
}
SmushPlayer::~SmushPlayer() {
- if (_initDone)
- release();
+ release();
}
void SmushPlayer::init() {
@@ -286,7 +285,9 @@
}
void SmushPlayer::release() {
-
+ if (!_initDone)
+ return;
+
_vm->_timer->removeTimerProc(&timerCallback);
_vm->_smushVideoShouldFinish = true;
@@ -334,6 +335,9 @@
// some explanation.
_vm->virtscr[0].pitch = _origPitch;
_vm->gdi._numStrips = _origNumStrips;
+
+
+ _initDone = false;
}
void SmushPlayer::checkBlock(const Chunk &b, Chunk::type type_expected, uint32 min_size) {
More information about the Scummvm-git-logs
mailing list