smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 23:35:03 +01:00
Code Issues Projects Releases Wiki Activity

Fix another stuck splash screen

Browse source 
Don't allow dialogs to re-create the splash only to hide it.
This commit is contained in:
Robin Gareus 2020-01-17 18:52:33 +01:00
parent 4b355868cc
commit 0ad9c3de1a
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
3 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/ardour_dialog.cc
View file

@ -87,7 +87,7 @@ void
ArdourDialog::pop_splash () ArdourDialog::pop_splash ()
{ {
if (_splash_pushed) { if (_splash_pushed) {
Splash* spl = Splash::instance(); Splash* spl = Splash::exists () ? Splash::instance() : NULL;
if (spl) { if (spl) {
spl->pop_front(); spl->pop_front();

2
gtk2_ardour/ardour_message.cc
View file

@ -77,7 +77,7 @@ void
ArdourMessageDialog::pop_splash () ArdourMessageDialog::pop_splash ()
{ {
if (_splash_pushed) { if (_splash_pushed) {
Splash* spl = Splash::instance(); Splash* spl = Splash::exists () ? Splash::instance() : NULL;
if (spl) { if (spl) {
spl->pop_front(); spl->pop_front();
} }

8
gtk2_ardour/ardour_ui_startup.cc
View file

@ -100,13 +100,7 @@ ARDOUR_UI::first_idle ()
editor->first_idle(); editor->first_idle();
} }
/* in 1 second, hide the splash screen /* 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.
*/
Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 1000); Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 1000);
Keyboard::set_can_save_keybindings (true); Keyboard::set_can_save_keybindings (true);