Fix another stuck splash screen
Don't allow dialogs to re-create the splash only to hide it.
This commit is contained in:
parent
4b355868cc
commit
0ad9c3de1a
|
@ -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();
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue
Block a user