From 54c486710d171ce0e960e90f0e451a7548c7ab4f Mon Sep 17 00:00:00 2001
From: Ray Greenwell <ray@threerings.net>
Date: Tue, 26 Nov 2002 18:54:39 +0000
Subject: [PATCH] When music is stopped because the volume is turned to 0,
 don't remove it from the playing music stack.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1996 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../com/threerings/media/sound/SoundManager.java     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/java/com/threerings/media/sound/SoundManager.java b/src/java/com/threerings/media/sound/SoundManager.java
index 3fc57fa30..7da2245f7 100644
--- a/src/java/com/threerings/media/sound/SoundManager.java
+++ b/src/java/com/threerings/media/sound/SoundManager.java
@@ -1,5 +1,5 @@
 //
-// $Id: SoundManager.java,v 1.30 2002/11/26 02:46:52 ray Exp $
+// $Id: SoundManager.java,v 1.31 2002/11/26 18:54:39 ray Exp $
 
 package com.threerings.media;
 
@@ -550,7 +550,7 @@ public class SoundManager
             break;
 
         case STOP:
-            shutdownMusic();
+            stopMusicPlayer();
             break;
         }
     }
@@ -568,6 +568,14 @@ public class SoundManager
     protected void shutdownMusic ()
     {
         _musicStack.clear();
+        stopMusicPlayer();
+    }
+
+    /**
+     * Stop the current music player.
+     */
+    protected void stopMusicPlayer ()
+    {
         if (_musicPlayer != null) {
             _musicPlayer.stop();
             _musicPlayer.shutdown();