From d541535ab6cdb38f8d6efba68411477adec136f5 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 16 Jan 2005 13:32:48 +0000
Subject: Cosmetic change, avoiding a hypothetical threading problem, see bug
 #1098864

svn-id: r16569
---
 scumm/smush/smush_player.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'scumm/smush')

diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index d5eaac4511..0076c287a9 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -257,8 +257,7 @@ SmushPlayer::SmushPlayer(ScummEngine_v6 *scumm, int speed) {
 }
 
 SmushPlayer::~SmushPlayer() {
-	if (_initDone)
-		release();
+	release();
 }
 
 void SmushPlayer::init() {
@@ -286,7 +285,9 @@ void SmushPlayer::init() {
 }
 
 void SmushPlayer::release() {
-	
+	if (!_initDone)
+		return;
+
 	_vm->_timer->removeTimerProc(&timerCallback);
 
 	_vm->_smushVideoShouldFinish = true;
@@ -334,6 +335,9 @@ void SmushPlayer::release() {
 	// 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) {
-- 
cgit v1.2.3