1 files changed, 38 insertions, 18 deletions

diff --git a/engines/neverhood/smackerplayer.cpp b/engines/neverhood/smackerplayer.cpp
index b67c8db9fc..187939faee 100644
--- a/engines/neverhood/smackerplayer.cpp
+++ b/engines/neverhood/smackerplayer.cpp
@@ -31,7 +31,7 @@ namespace Neverhood {
 // SmackerSurface
 
 SmackerSurface::SmackerSurface(NeverhoodEngine *vm)
-	: BaseSurface(vm, 0, 0, 0), _smackerFrame(NULL) {
+	: BaseSurface(vm, 0, 0, 0, "smacker"), _smackerFrame(NULL) {
 }
 
 void SmackerSurface::draw() {
@@ -51,6 +51,18 @@ void SmackerSurface::setSmackerFrame(const Graphics::Surface *smackerFrame) {
 	_smackerFrame = smackerFrame;
 }
 
+void SmackerSurface::unsetSmackerFrame() {
+	_drawRect.x = 0;
+	_drawRect.y = 0;
+	_drawRect.width = 0;
+	_drawRect.height = 0;
+	_sysRect.x = 0;
+	_sysRect.y = 0;
+	_sysRect.width = 0;
+	_sysRect.height = 0;
+	_smackerFrame = NULL;
+}
+
 // SmackerDoubleSurface
 
 SmackerDoubleSurface::SmackerDoubleSurface(NeverhoodEngine *vm)
@@ -62,25 +74,27 @@ void SmackerDoubleSurface::draw() {
 		_vm->_screen->drawDoubleSurface2(_smackerFrame, _drawRect);
 }
 
+// NeverhoodSmackerDecoder
+
 void NeverhoodSmackerDecoder::forceSeekToFrame(uint frame) {
 	if (!isVideoLoaded())
 		return;
-	
+
 	if (frame >= getFrameCount())
 		error("Can't force Smacker seek to invalid frame %d", frame);
-	
+
 	if (_header.audioInfo[0].hasAudio)
 		error("Can't force Smacker frame seek with audio");
 	if (!rewind())
 		error("Failed to rewind");
-	
+
 	SmackerVideoTrack *videoTrack = (SmackerVideoTrack *)getTrack(0);
 	uint32 offset = 0;
 	for (uint32 i = 0; i < frame; i++) {
 		videoTrack->increaseCurFrame();
 		offset += _frameSizes[i] & ~3;
 	}
-	
+
 	_fileStream->seek(offset, SEEK_CUR);
 }
 
@@ -92,40 +106,43 @@ SmackerPlayer::SmackerPlayer(NeverhoodEngine *vm, Scene *scene, uint32 fileHash,
 	_drawX(-1), _drawY(-1) {
 
 	SetUpdateHandler(&SmackerPlayer::update);
+
+	if (_doubleSurface) {
+		_smackerSurface = new SmackerDoubleSurface(_vm);
+	} else {
+		_smackerSurface = new SmackerSurface(_vm);
+	}
+
 	open(fileHash, flag);
 }
 
 SmackerPlayer::~SmackerPlayer() {
 	close();
+	delete _smackerSurface;
+	_smackerSurface = NULL;
 }
 
 void SmackerPlayer::open(uint32 fileHash, bool keepLastFrame) {
 	debug(0, "SmackerPlayer::open(%08X)", fileHash);
-	
+
 	_fileHash = fileHash;
 	_keepLastFrame = keepLastFrame;
 
 	close();
 
-	if (_doubleSurface) {
-		_smackerSurface = new SmackerDoubleSurface(_vm);
-	} else {
-		_smackerSurface = new SmackerSurface(_vm);
-	}
-
 	_smackerFirst = true;
 
 	_stream = _vm->_res->createStream(fileHash);
 
 	_smackerDecoder = new NeverhoodSmackerDecoder();
 	_smackerDecoder->loadStream(_stream);
-	
+
 	_palette = new Palette(_vm);
 	_palette->usePalette();
 
 	if (!_paused)
 		_smackerDecoder->start();
-	
+
 }
 
 void SmackerPlayer::close() {
@@ -134,11 +151,10 @@ void SmackerPlayer::close() {
 	delete _smackerDecoder;
 	delete _palette;
 	// NOTE The SmackerDecoder deletes the _stream
-	delete _smackerSurface;
 	_smackerDecoder = NULL;
 	_palette = NULL;
 	_stream = NULL;
-	_smackerSurface = NULL;
+	_smackerSurface->unsetSmackerFrame();
 }
 
 void SmackerPlayer::gotoFrame(int frameNumber) {
@@ -196,10 +212,14 @@ void SmackerPlayer::update() {
 			_videoDone = false;
 		}
 	}
-	
+
 }
 
 void SmackerPlayer::updateFrame() {
+
+	if (!_smackerDecoder || !_smackerSurface)
+		return;
+
 	const Graphics::Surface *smackerFrame = _smackerDecoder->decodeNextFrame();
 
 	if (_smackerFirst) {
@@ -220,7 +240,7 @@ void SmackerPlayer::updateFrame() {
 
 	if (_smackerDecoder->hasDirtyPalette())
 		updatePalette();
-		
+
 }
 
 void SmackerPlayer::updatePalette() {