aboutsummaryrefslogtreecommitdiff
path: root/scumm/imuse_digi
diff options
context:
space:
mode:
authorPaweł Kołodziejski2005-02-12 15:00:16 +0000
committerPaweł Kołodziejski2005-02-12 15:00:16 +0000
commitddd97c96da9e647ab80c96b2cd672d9464d75d29 (patch)
tree8a5152d49c16317a6e3ba14f499d7dabb117eff4 /scumm/imuse_digi
parent4a0887f34d3fb4a50af4dd17d45196b47dabb703 (diff)
downloadscummvm-rg350-ddd97c96da9e647ab80c96b2cd672d9464d75d29.tar.gz
scummvm-rg350-ddd97c96da9e647ab80c96b2cd672d9464d75d29.tar.bz2
scummvm-rg350-ddd97c96da9e647ab80c96b2cd672d9464d75d29.zip
fix/workaround for bug: 1120625
svn-id: r16779
Diffstat (limited to 'scumm/imuse_digi')
-rw-r--r--scumm/imuse_digi/dimuse.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/scumm/imuse_digi/dimuse.cpp b/scumm/imuse_digi/dimuse.cpp
index af8259b23a..3f8265be83 100644
--- a/scumm/imuse_digi/dimuse.cpp
+++ b/scumm/imuse_digi/dimuse.cpp
@@ -144,7 +144,14 @@ void IMuseDigital::saveOrLoad(Serializer *ser) {
track->soundHandle = _sound->openSound(track->soundId,
track->soundName, track->soundType,
track->volGroupId, -1);
- assert(track->soundHandle);
+ if (!track->soundHandle) {
+ warning("IMuseDigital::saveOrLoad: Can't open sound so will not be resumed, propably on diffrent CD");
+ track->stream2 = NULL;
+ track->stream = NULL;
+ track->used = false;
+ continue;
+ }
+
if (track->compressed) {
track->regionOffset = 0;
}