Fix master volume fade

[perso/Immae/Projets/Python/MusicSampler.git] / helpers / action.py

diff --git a/helpers/action.py b/helpers/action.py
index b8e44e6783267fcfd9781f3817cf1fbd58f550ee..eaa419b8d10e237aefd2ec3d4949660d6779f834 100644 (file)
--- a/helpers/action.py
+++ b/helpers/action.py
@@ -95,6 +95,8 @@ class Action:
                 if previous is not None:
                     previous.stop(fade_out=fade_out)
                 previous = music
+            else:
+                music.stop(fade_out=fade_out)
 
         if previous is not None:
             previous.stop(fade_out=fade_out, wait=wait)
@@ -106,7 +108,7 @@ class Action:
         if music is not None:
             music.set_volume(value, delta=delta, fade=fade)
         else:
-            self.mapping.set_master_volume(value, delta=delta)
+            self.mapping.set_master_volume(value, delta=delta, fade=fade)
 
     def wait(self, duration=0, music=None, **kwargs):
         self.sleep_event = threading.Event()
@@ -210,7 +212,7 @@ class Action:
                 message += "setting volume to {}%" \
                         .format(value)
 
-        if music is not None and fade > 0:
+        if fade > 0:
             message += " with {}s fade".format(fade)
 
         return message