Sub editor: zooming not allowed if the cursor is on a GUIComponent, disabled music, limiting item names in the "previously used" listbox

2016-11-29 18:32:51 +02:00
parent 0b03b78606
commit e10b3dfef5
3 changed files with 24 additions and 15 deletions
--- a/Subsurface/Source/Sounds/SoundPlayer.cs
+++ b/Subsurface/Source/Sounds/SoundPlayer.cs
@@ -247,7 +247,11 @@ namespace Barotrauma
            
            List<BackgroundMusic> suitableMusic = GetSuitableMusicClips();

-            if (suitableMusic.Count > 0 && !suitableMusic.Contains(currentMusic))
+            if (suitableMusic.Count == 0)
+            {
+                targetMusic = null;
+            }                
+            else if (!suitableMusic.Contains(currentMusic))
            {
                int index = Rand.Int(suitableMusic.Count);