diff options
| author | Robin Gareus <robin@gareus.org> | 2017-04-20 23:16:09 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-04-20 23:16:09 +0200 |
| commit | e1c4fe8edc0c4af3baecbdcd55ee27059ff97469 (patch) | |
| tree | 49265a9ff25223949821708dad7883cb50e846eb | |
| parent | 057bb167caf9780d9f837a53b85ee8e0cad9387e (diff) | |
Show the splash-screen if the engine dialog's run() hid it.
| -rw-r--r-- | gtk2_ardour/ardour_dialog.h | 4 | ||||
| -rw-r--r-- | gtk2_ardour/engine_dialog.cc | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gtk2_ardour/ardour_dialog.h b/gtk2_ardour/ardour_dialog.h index 990d86024f..9e91d3e97e 100644 --- a/gtk2_ardour/ardour_dialog.h +++ b/gtk2_ardour/ardour_dialog.h @@ -49,11 +49,13 @@ public: void on_show (); virtual void on_response (int); +protected: + void pop_splash (); + private: WM::ProxyTemporary* proxy; bool _splash_pushed; void init (); - void pop_splash (); static sigc::signal<void> CloseAllDialogs; }; diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index e62d6ebe70..9ed3812669 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -2670,6 +2670,7 @@ EngineControl::start_stop_button_clicked () ARDOUR::AudioEngine::instance()->stop (); } else { if (!ARDOUR_UI::instance()->session_loaded) { + pop_splash (); hide (); ARDOUR::GUIIdle (); } @@ -3084,6 +3085,7 @@ EngineControl::connect_disconnect_click() stop_engine (); } else { if (!ARDOUR_UI::instance()->session_loaded) { + pop_splash (); hide (); ARDOUR::GUIIdle (); } |