WINTERMUTE: Make Theora-playback fail properly when THEORA isn't compiled in.

This commit is contained in:
Einar Johan Trøan Sømåen committed 2012-06-11 15:35:32 +02:00
1 parent ef2eb685dd
commit 63efd76192
2 files changed
+6 -2

No files matched your search

+5 -1
View File
@@ -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;
}
+1 -1
View File
@@ -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;