Re-fix multi present problem (without breaking cmdline session loading).

git-svn-id: svn://localhost/ardour2/trunk@918 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 19e5d34244d3884fd23117cf291b8215a91d2afd..c67697ba4a3224cda02d69bdc0433bff761dc547 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1833,6 +1833,8 @@ ARDOUR_UI::make_session_clean ()
                session->set_clean ();
        }
 
+       show ();
+
        return FALSE;
 }
 
@@ -1881,6 +1883,11 @@ ARDOUR_UI::show ()
 {
        if (editor) {
                editor->show_window ();
+               
+               if (!shown_flag) {
+                       editor->present ();
+               }
+
                shown_flag = true;
        }
        

diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index c90480c1dd9fbae244f4d5be8ba440c1b4440c6d..fe5963c53572f5557afa9f5931bc1755ec350b41 100644 (file)
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -131,10 +131,6 @@ ARDOUR_UI::connect_to_session (Session *s)
        start_clocking ();
        start_blinking ();
 
-       if (editor) {
-               editor->present();
-       }
-
        transport_stopped ();
 
        second_connection = Glib::signal_timeout().connect (mem_fun(*this, &ARDOUR_UI::every_second), 1000);