stopSound crash fix

9 years ago · 53158d29b1
parent 67a6a8f5d4
commit 53158d29b1
2 changed files with 3 additions and 1 deletions
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@ -612,7 +612,8 @@ namespace MWSound

    void SoundManager::stopSound(MWBase::SoundPtr sound)
    {
-        mOutput->stopSound(sound);
+        if (sound.get())
+            mOutput->stopSound(sound);
    }

    void SoundManager::stopSound3D(const MWWorld::Ptr &ptr, const std::string& soundId)
--- a/apps/openmw/mwsound/soundmanagerimp.hpp
+++ b/apps/openmw/mwsound/soundmanagerimp.hpp
@ -201,6 +201,7 @@ namespace MWSound

        virtual void stopSound(MWBase::SoundPtr sound);
        ///< Stop the given sound from playing
+        /// @note no-op if \a sound is null

        virtual void stopSound3D(const MWWorld::Ptr &reference, const std::string& soundId);
        ///< Stop the given object from playing the given sound,