Fix master volume fade

diff --git a/helpers/action.py b/helpers/action.py
index 247e0a9c50ff765cdf73d33490a5895930575a53..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)

diff --git a/helpers/mapping.py b/helpers/mapping.py
index 3622f9d8d42086369d59702cf45e6e3cd03fa9d5..43cacf2990a2c0f3f6d70573ce0225dcb765abb1 100644 (file)
--- a/helpers/mapping.py
+++ b/helpers/mapping.py
@@ -39,6 +39,9 @@ class Mapping(RelativeLayout):
                 self.master_volume)
 
         for music in self.open_files.values():
+            if not (music.is_loaded_playing() or music.is_loaded_paused()):
+                continue
+
             if fade > 0:
                 music.gain_effects.append(GainEffect(
                     "fade",

diff --git a/helpers/music_file.py b/helpers/music_file.py
index aef0adce00c4f55f539b67dd07479bdae7327b7e..b26a1beea56fdcdd440b6f66539d60ec2657d02e 100644 (file)
--- a/helpers/music_file.py
+++ b/helpers/music_file.py
@@ -70,7 +70,8 @@ class MusicFile(Machine):
         ]
 
         Machine.__init__(self, states=states,
-                transitions=transitions, initial='initial')
+                transitions=transitions, initial='initial',
+                ignore_invalid_triggers=True)
 
         self.volume = 100
         self.mapping = mapping