On open, only clear channels if loading xml file succeeds

diff --git a/channel.py b/channel.py
index 423be189bb4059c893e5c33b98bb41be2054234b..0ca1bbf5938b7e9708dcf96bf6b5940435a48535 100644 (file)
--- a/channel.py
+++ b/channel.py
@@ -243,7 +243,8 @@ class Channel(Gtk.VBox, SerializedObject):
         #print "Default slider scale change detected."
         self.slider_scale = scale
         self.slider_adjustment.set_scale(scale)
-        self.channel.midi_scale = self.slider_scale.scale
+        if self.channel:
+            self.channel.midi_scale = self.slider_scale.scale
 
     def on_vumeter_color_changed(self, gui_factory, *args):
         color = gui_factory.get_vumeter_color()

diff --git a/jack_mixer.py b/jack_mixer.py
index f09954c01a39e514f806be0f7673b41ca45c63c3..e3fef8a6ddf7e4cd7b46a4cb2c67c4e240e9137c 100755 (executable)
--- a/jack_mixer.py
+++ b/jack_mixer.py
@@ -665,7 +665,6 @@ Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA''')
 
     def load_from_xml(self, file, silence_errors=False):
         #print "Loading from XML..."
-        self.on_channels_clear(None)
         self.unserialized_channels = []
         b = XmlSerialization()
         try:
@@ -674,6 +673,7 @@ Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA''')
             if silence_errors:
                 return
             raise
+        self.on_channels_clear(None)
         s = Serializator()
         s.unserialize(self, b)
         for channel in self.unserialized_channels: