Show the splash-screen if the engine dialog's run() hid it.

diff --git a/gtk2_ardour/ardour_dialog.h b/gtk2_ardour/ardour_dialog.h
index 990d86024f562d5eb3ce481ef36cf5db706e8e48..9e91d3e97e877e73b90c25ee6690d14f823470f3 100644 (file)
--- 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 e62d6ebe70af3aa57eeb33f4bf5b75b3a756cc7a..9ed3812669799b6da9937f4e24b2e4ded7bfe150 100644 (file)
--- 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 ();
                }