diff options
| author | David Robillard <d@drobilla.net> | 2006-09-16 23:43:51 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-09-16 23:43:51 +0000 |
| commit | 2b2a51b4a3ae944fe30a0baad81ebde4510bf895 (patch) | |
| tree | 718f80c66b57c7811ead742d2193958858297c38 /gtk2_ardour | |
| parent | b9b736899cfb3b80927bf00112f4970037baad84 (diff) | |
Re-fix multi present problem (without breaking cmdline session loading).
git-svn-id: svn://localhost/ardour2/trunk@918 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 7 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui_dialogs.cc | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 19e5d34244..c67697ba4a 100644 --- 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 c90480c1dd..fe5963c535 100644 --- 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); |