diff options
| -rw-r--r-- | gtk2_ardour/ardour_dialog.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_message.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui_startup.cc | 8 |
3 files changed, 3 insertions, 9 deletions
diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc index fe3a1cc80f..1cf588fbf6 100644 --- 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 d6302fb2c6..14039d7fe6 100644 --- 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 3eac97ff9e..f52bbfb9f5 100644 --- 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); |