- Small fix: don't reenable history notifications if they

were disabled when we started to load an XML file


git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@1106 3ecf2c5c-341e-0410-92b4-d18e462d057c

plugins/xmlsave/src/xml_serializer.cc

@@ -70,7 +70,7 @@ void XMLSerializer::restore_snapshot(const Glib::ustring& filename, History& his
   // DEBUG - remove me when finished
 
   // disable notifications over history until the end of this method
-  hist.set_notify_enabled(false);
+  bool was_enabled = hist.set_notify_enabled(false);
 
 #ifdef LIBXML_SAX1_ENABLED
   xmlDocPtr doc;
@@ -108,7 +108,7 @@ void XMLSerializer::restore_snapshot(const Glib::ustring& filename, History& his
 #endif /* LIBXML_SAX1_ENABLED */
 
   // Re-enable notifications over history observers
-  hist.set_notify_enabled(true);
+  hist.set_notify_enabled(was_enabled);
 }
 
 

src/jump_to_dialog.cc

@@ -96,7 +96,7 @@ JumpToDialog::_on_jump()
     {
       sim.run();
       if(sim.get_state() == Simulation::state_stopped)
-	break; // Simulation ended before reaching _target_instant
+	      break; // Simulation ended before reaching _target_instant
     }
   }
   // TODO: exception handling copied from SimulationController, it should be factored out