Merge remote branch 'zini/master'

apps/openmw/engine.cpp

@@ -67,7 +67,7 @@ void OMW::Engine::executeLocalScripts()
 
 bool OMW::Engine::frameStarted(const Ogre::FrameEvent& evt)
 {
-	if(! (mEnvironment.mSoundManager->isMusicPlaying()))
+    if(mUseSound && !(mEnvironment.mSoundManager->isMusicPlaying()))
     {
         // Play some good 'ol tunes
         mEnvironment.mSoundManager->startRandomTitle();

apps/openmw/mwsound/soundmanager.cpp

@@ -365,7 +365,11 @@ namespace MWSound
 
     bool SoundManager::isMusicPlaying()
     {
-	    bool test =  mData->music->isPlaying();
+        bool test = false;
+        if(mData && mData->music)
+        {
+            test = mData->music->isPlaying();
+        }
         return test;
     }