From e4bdb99f60065d5ed3fc8a8a07606f71deb6be2c Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Wed, 7 Jul 2021 01:02:13 +0200
Subject: [PATCH] Do not unconditionally show splash screen

---
 gtk2_ardour/ardour_ui.cc | 4 +++-
 gtk2_ardour/luadialog.cc | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 2402acc078..5eccc95d1e 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -2960,7 +2960,9 @@ what you would like to do.\n"), PROGRAM_NAME));
 	image->show();
 	hbox->show();
 
-	Splash::instance()->hide ();
+	if (Splash::exists ()) {
+		Splash::instance()->hide ();
+	}
 
 	switch (dialog.run ()) {
 	case RESPONSE_ACCEPT:
diff --git a/gtk2_ardour/luadialog.cc b/gtk2_ardour/luadialog.cc
index dc5a07b9af..e01806dd77 100644
--- a/gtk2_ardour/luadialog.cc
+++ b/gtk2_ardour/luadialog.cc
@@ -51,7 +51,7 @@ Message::run ()
 {
 
 	bool splash_pushed = false;
-	Splash* spl = Splash::instance();
+	Splash* spl = Splash::exists () ? Splash::instance() : NULL;
 	if (spl && spl->is_visible()) {
 		spl->pop_back_for (_message_dialog);
 		splash_pushed = true;
@@ -61,7 +61,7 @@ Message::run ()
 	_message_dialog.hide ();
 
 	if (splash_pushed) {
-		spl = Splash::instance();
+		spl = Splash::exists () ? Splash::instance() : NULL;
 		if (spl) {
 			spl->pop_front_for (_message_dialog);
 		}