# HG changeset patch
# User David McClosky <dmcc@bigasterisk.com>
# Date 2005-06-18 01:37:23
# Node ID 2848cf5e14c5cbcde45cab7231c435ec19f7d6af
# Parent  34d29b3a1ce30f38229db1b86db3ceffe4a0aa17

keyboardcomposer: skip subs at 0 when combining, temporary subs don't listen for reloads

diff --git a/bin/keyboardcomposer b/bin/keyboardcomposer
--- a/bin/keyboardcomposer
+++ b/bin/keyboardcomposer
@@ -209,7 +209,7 @@ class KeyboardComposer(Frame, SubClient)
             for name, slidervar in self.slider_vars.items()])
     def get_levels_as_sub(self):
         scaledsubs = [self.submasters.get_sub_by_name(sub) * level \
-            for sub, level in self.get_levels().items()]
+            for sub, level in self.get_levels().items() if level > 0.0]
 
         maxes = sub_maxes(*scaledsubs)
         return maxes
diff --git a/light9/Submaster.py b/light9/Submaster.py
--- a/light9/Submaster.py
+++ b/light9/Submaster.py
@@ -14,7 +14,8 @@ class Submaster:
         else:
             self.levels = {}
             self.reload(quiet=True)
-        dispatcher.connect(self.reload, 'reload all subs')
+        if not self.temporary:
+            dispatcher.connect(self.reload, 'reload all subs')
     def reload(self, quiet=False):
         if self.temporary:
             return