aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2002-12-03 17:54:25 +0000
committerMax Horn2002-12-03 17:54:25 +0000
commit9fb83e313a0dac5a1e4a9414c267125d3296cbc6 (patch)
tree484a6a07f489cb6520d6578bf2277a96645bdce8 /scumm
parent57f77a394a9e627d6cf85856d96f0cdd0ab1de0c (diff)
downloadscummvm-rg350-9fb83e313a0dac5a1e4a9414c267125d3296cbc6.tar.gz
scummvm-rg350-9fb83e313a0dac5a1e4a9414c267125d3296cbc6.tar.bz2
scummvm-rg350-9fb83e313a0dac5a1e4a9414c267125d3296cbc6.zip
fixed a race condition during startup of ScummVM
svn-id: r5822
Diffstat (limited to 'scumm')
-rw-r--r--scumm/imuse.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp
index e1699e7a4b..85ef24ed62 100644
--- a/scumm/imuse.cpp
+++ b/scumm/imuse.cpp
@@ -3735,7 +3735,8 @@ void IMuseGM::init(IMuseInternal *eng, OSystem *syst)
}
void IMuseGM::timer_callback (void *) {
- g_scumm->_imuse->on_timer();
+ if (g_scumm->_imuse)
+ g_scumm->_imuse->on_timer();
}
void IMuseGM::uninit()