From 63efd7619221f4c4591c65c2ca3419006586ccbc Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Mon, 11 Jun 2012 15:35:32 +0200
Subject: WINTERMUTE: Make Theora-playback fail properly when THEORA isn't
 compiled in.

---
 engines/wintermute/Base/BGame.cpp            | 6 +++++-
 engines/wintermute/video/VidTheoraPlayer.cpp | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/engines/wintermute/Base/BGame.cpp b/engines/wintermute/Base/BGame.cpp
index 074aad18ff..60a2ee1f28 100644
--- a/engines/wintermute/Base/BGame.cpp
+++ b/engines/wintermute/Base/BGame.cpp
@@ -1476,7 +1476,11 @@ HRESULT CBGame::ScCallMethod(CScScript *Script, CScStack *Stack, CScStack *ThisS
 			}
 			else Stack->PushBool(false);
 		}
-		else Stack->PushBool(false);
+		else {
+			Stack->PushBool(false);
+			delete _theoraPlayer;
+			_theoraPlayer = NULL;
+		}
 		
 		return S_OK;
 	}
diff --git a/engines/wintermute/video/VidTheoraPlayer.cpp b/engines/wintermute/video/VidTheoraPlayer.cpp
index 6820dbe809..048027be2c 100644
--- a/engines/wintermute/video/VidTheoraPlayer.cpp
+++ b/engines/wintermute/video/VidTheoraPlayer.cpp
@@ -116,7 +116,7 @@ HRESULT CVidTheoraPlayer::initialize(const Common::String &filename, const Commo
 	if (!_file) return E_FAIL;
 	
 	//if (Filename != _filename) CBUtils::SetString(&_filename, Filename);
-#if defined (USE_THEORA)
+#if defined (USE_THEORADEC)
 	_theoraDecoder = new TheoraDecoder();
 #else
 	return E_FAIL;
-- 
cgit v1.2.3