- 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
This commit is contained in:
tchernobog 2006-09-12 09:39:17 +00:00
parent 1d7c053012
commit efa5b781ef
2 changed files with 3 additions and 3 deletions

View File

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

View File

@ -96,7 +96,7 @@ JumpToDialog::_on_jump()
{ {
sim.run(); sim.run();
if(sim.get_state() == Simulation::state_stopped) 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 // TODO: exception handling copied from SimulationController, it should be factored out