Fix for the --nosound crash

13 years ago · f567950e25
parent af39275a63
commit f567950e25
2 changed files with 8 additions and 2 deletions
--- a/apps/openmw/mwsound/soundmanager.cpp
+++ b/apps/openmw/mwsound/soundmanager.cpp
@ -67,6 +67,7 @@ namespace MWSound
        , updater(mgr)
        , cameraTracker(mgr)
        , mCurrentPlaylist(NULL)
+        , mUsingSound(useSound)
    {
        if(useSound)
        {
@ -105,8 +106,11 @@ namespace MWSound

    SoundManager::~SoundManager()
    {
-        Ogre::Root::getSingleton().removeFrameListener(&updater);
-        cameraTracker.unfollowCamera();
+        if(mUsingSound)
+        {
+            Ogre::Root::getSingleton().removeFrameListener(&updater);
+            cameraTracker.unfollowCamera();
+        }
    }

    // Convert a soundId to file name, and modify the volume
--- a/apps/openmw/mwsound/soundmanager.hpp
+++ b/apps/openmw/mwsound/soundmanager.hpp
@ -82,6 +82,8 @@ namespace MWSound

            IDMap mLoopedSounds;

+            bool mUsingSound;
+
            std::string lookup(const std::string &soundId,
                       float &volume, float &min, float &max);
            void add(const std::string &file,