followup to the previous tempo-dragging commit: use argument to Drag::aborted() to...

[ardour.git] / gtk2_ardour / ardour_ui_dependents.cc

diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index f7e6a89eb0d7e5b58d95f13527b7eb69b90db984..c55942b4bda74ec78c39f4dfaca75425f6948b45 100644 (file)
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -53,7 +53,9 @@ using namespace ARDOUR;
 void
 ARDOUR_UI::shutdown ()
 {
-       ui_config->save_state();
+       if (ui_config->dirty()) {
+               ui_config->save_state();
+       }
 }
 
 void
@@ -64,6 +66,9 @@ ARDOUR_UI::we_have_dependents ()
        keyboard->setup_keybindings ();
        editor->setup_tooltips ();
        editor->UpdateAllTransportClocks.connect (sigc::mem_fun (*this, &ARDOUR_UI::update_transport_clocks));
+
+       editor->track_mixer_selection ();
+       mixer->track_editor_selection ();
 }
 
 void
@@ -117,13 +122,13 @@ ARDOUR_UI::toggle_mixer_window ()
        }
 
        Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
-       
+
        if (tact->get_active()) {
                goto_mixer_window ();
        } else {
                mixer->hide ();
        }
-}      
+}
 
 void
 ARDOUR_UI::toggle_mixer_on_top ()
@@ -134,19 +139,19 @@ ARDOUR_UI::toggle_mixer_on_top ()
        }
 
        Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
-       
+
        if (tact->get_active()) {
 
                /* Toggle the mixer to `visible' if required */
                act = ActionManager::get_action (X_("Common"), X_("toggle-mixer"));
                if (act) {
                        tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
-       
+
                        if (!tact->get_active()) {
                                tact->set_active ();
                        }
                }
-               
+
                goto_mixer_window ();
        } else {
                goto_editor_window ();