From d38f2f0a00cd54833c38d382fb1d183309cfb662 Mon Sep 17 00:00:00 2001 From: Jan-Peter Nilsson Date: Sat, 1 Jan 2011 22:33:08 +0100 Subject: [PATCH] See if we have an instance of mData before trying to use it otherwise we get a crash when starting with --nosound --- apps/openmw/mwsound/soundmanager.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/openmw/mwsound/soundmanager.cpp b/apps/openmw/mwsound/soundmanager.cpp index 8bdd8e2b98..28bb08479f 100644 --- a/apps/openmw/mwsound/soundmanager.cpp +++ b/apps/openmw/mwsound/soundmanager.cpp @@ -364,10 +364,14 @@ namespace MWSound bool SoundManager::isMusicPlaying() - { - bool test = mData->music->isPlaying(); - return test; - } + { + bool test = false; + if(mData && mData->music) + { + test = mData->music->isPlaying(); + } + return test; + } SoundManager::SoundImpl SoundManager::getMData() {