Merge pull request #38 from Shraymonks/V2.97a.20130512+DEV

V2.97a.20130512+dev
scottschiller · Nov 9, 2013 · 7a33be2 · 7a33be2
2 parents 5fc6faa + 9637326
commit 7a33be2
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/script/soundmanager2.js b/script/soundmanager2.js
@@ -2047,7 +2047,7 @@ function SoundManager(smURL, smID) {
             }
 
             // playing multiple muted sounds? if you do this, you're weird ;) - but let's cover it.
-            if (s._iO.muted) {
+            if (s.muted) {
               audioClone.muted = true;
             }
 
@@ -2437,6 +2437,10 @@ function SoundManager(smURL, smID) {
       if (!s.isHTML5) {
         flash._setVolume(s.id, (sm2.muted && !s.muted) || s.muted?0:nVol);
       } else if (s._a) {
+        if (sm2.muted && !s.muted) {
+          s.muted = true;
+          s._a.muted = true;
+        }
         // valid range: 0-1
         s._a.volume = Math.max(0, Math.min(1, nVol/100));
       }
@@ -5971,4 +5975,4 @@ if (window.SM2_DEFER === undefined || !SM2_DEFER) {
 window.SoundManager = SoundManager; // constructor
 window.soundManager = soundManager; // public API, flash callbacks etc.
 
-}(window));
+}(window));