Fix another stuck splash screen

Don't allow dialogs to re-create the splash only to hide it.

diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc
index fe3a1cc80f6a107cdc0f96d0441e277a6fee3112..1cf588fbf645b80fc9ab6150979711008f3ef109 100644 (file)
--- a/gtk2_ardour/ardour_dialog.cc
+++ b/gtk2_ardour/ardour_dialog.cc
@@ -87,7 +87,7 @@ void
 ArdourDialog::pop_splash ()
 {
        if (_splash_pushed) {
-               Splash* spl = Splash::instance();
+               Splash* spl = Splash::exists () ? Splash::instance() : NULL;
 
                if (spl) {
                        spl->pop_front();

diff --git a/gtk2_ardour/ardour_message.cc b/gtk2_ardour/ardour_message.cc
index d6302fb2c62d2f6c51203a6d846c523a5e4911c8..14039d7fe6705f2943fdd1c6b5776f7d14051769 100644 (file)
--- a/gtk2_ardour/ardour_message.cc
+++ b/gtk2_ardour/ardour_message.cc
@@ -77,7 +77,7 @@ void
 ArdourMessageDialog::pop_splash ()
 {
        if (_splash_pushed) {
-               Splash* spl = Splash::instance();
+               Splash* spl = Splash::exists () ? Splash::instance() : NULL;
                if (spl) {
                        spl->pop_front();
                }

diff --git a/gtk2_ardour/ardour_ui_startup.cc b/gtk2_ardour/ardour_ui_startup.cc
index 3eac97ff9efaf291d547b520d175cc308e58110c..f52bbfb9f57cbf1a9df182931cff4652e47d2db7 100644 (file)
--- a/gtk2_ardour/ardour_ui_startup.cc
+++ b/gtk2_ardour/ardour_ui_startup.cc
@@ -100,13 +100,7 @@ ARDOUR_UI::first_idle ()
                editor->first_idle();
        }
 
-       /* in 1 second, hide the splash screen
-        *
-        * Consider hiding it *now*. If a user opens opens a dialog
-        * during that one second while the splash is still visible,
-        * the dialog will push-back the splash.
-        * Closing the dialog later will pop it back.
-        */
+       /* in 1 second, hide the splash screen */
        Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 1000);
 
        Keyboard::set_can_save_keybindings (true);