Additional null check in Wire Update, stopping paused sounds before deleting them (prevents an OpenAL error when switching to sub editor when the mainmenu drone sound is playing)

2016-12-21 20:35:38 +02:00
parent c01ac33e1d
commit c3d29e41ad
4 changed files with 21 additions and 13 deletions
@@ -247,7 +247,8 @@ namespace Barotrauma

            loadedSounds.Remove(this);

-            if (alSourceId>0 && SoundManager.IsPlaying(alSourceId))
+            if (alSourceId > 0 &&
+                (SoundManager.IsPlaying(alSourceId) || SoundManager.IsPaused(alSourceId)))
            {
                SoundManager.Stop(alSourceId);
                ALHelper.Check();
@@ -258,10 +259,10 @@ namespace Barotrauma
                if (s.oggSound == oggSound) return;
            }

-            //System.Diagnostics.Debug.WriteLine("Removing sound " + filePath + " (buffer id" + AlBufferId + ")");
-
            SoundManager.ClearAlSource(AlBufferId);
-            if (oggSound!=null) oggSound.Dispose();
+            ALHelper.Check();
+
+            if (oggSound != null) oggSound.Dispose();
        }