aboutsummaryrefslogtreecommitdiff
path: root/video/video_decoder.cpp
diff options
context:
space:
mode:
authorMatthew Hoops2012-08-12 08:33:45 -0400
committerMatthew Hoops2012-08-12 08:33:45 -0400
commit48c591a233b403193b897c76d2e61a0f8a4f6805 (patch)
tree3c0755f0e017e72db762be78217e5a6a0789bedf /video/video_decoder.cpp
parent0817a02a7d69313d4649af27062c7e3d89c0d2c5 (diff)
downloadscummvm-rg350-48c591a233b403193b897c76d2e61a0f8a4f6805.tar.gz
scummvm-rg350-48c591a233b403193b897c76d2e61a0f8a4f6805.tar.bz2
scummvm-rg350-48c591a233b403193b897c76d2e61a0f8a4f6805.zip
VIDEO: Don't allow adding external stream files to unopened videos
Diffstat (limited to 'video/video_decoder.cpp')
-rw-r--r--video/video_decoder.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/video/video_decoder.cpp b/video/video_decoder.cpp
index b27a0c512b..0108888613 100644
--- a/video/video_decoder.cpp
+++ b/video/video_decoder.cpp
@@ -575,6 +575,10 @@ void AdvancedVideoDecoder::addTrack(Track *track) {
}
bool AdvancedVideoDecoder::addStreamFileTrack(const Common::String &baseName) {
+ // Only allow adding external tracks if a video is already loaded
+ if (!isVideoLoaded())
+ return false;
+
StreamFileAudioTrack *track = new StreamFileAudioTrack();
bool result = track->loadFromFile(baseName);