Merged with trunk R1304

[ardour.git] / gtk2_ardour / ardour_ui_dialogs.cc

diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index a9a61176a903089ef0d6ac6abdfe34bb8353e11f..140ee649ea59f07b678609672b01e9e67b13858a 100644 (file)
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -125,6 +125,13 @@ ARDOUR_UI::connect_to_session (Session *s)
        
        connect_dependents_to_session (s);
 
+       /* listen to clock mode changes. don't do this earlier because otherwise as the clocks
+          restore their modes or are explicitly set, we will cause the "new" mode to be saved
+          back to the session XML ("extra") state.
+        */
+
+       AudioClock::ModeChanged.connect (mem_fun (*this, &ARDOUR_UI::store_clock_modes));
+
        start_clocking ();
        start_blinking ();