From a62df6076007398074f21e2581f5fa21f4f73e00 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Wed, 15 Jan 2020 22:01:30 +0100
Subject: [PATCH] Replace some Gtk:MessageDialog with Ardour's variant

This fixes some issues with stuck splash screen early on.
---
 gtk2_ardour/ardour_ui_options.cc | 3 ++-
 gtk2_ardour/editor.cc            | 5 +++--
 gtk2_ardour/main.cc              | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc
index 4998f76303..f18e09377a 100644
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -40,6 +40,7 @@
 #include "gtkmm2ext/utils.h"
 #include "waveview/wave_view.h"
 
+#include "ardour_message.h"
 #include "audio_clock.h"
 #include "ardour_ui.h"
 #include "actions.h"
@@ -60,7 +61,7 @@ ARDOUR_UI::toggle_external_sync()
 {
 	if (_session) {
 		if (_session->config.get_video_pullup() != 0.0f && (TransportMasterManager::instance().current()->type() == Engine)) {
-			MessageDialog msg (_("It is not possible to use JACK as the the sync source\n when the pull up/down setting is non-zero."));
+			ArdourMessageDialog msg (_("It is not possible to use JACK as the the sync source\n when the pull up/down setting is non-zero."));
 			msg.run ();
 			return;
 		}
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index fa4ad25bff..6e806b9c94 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -102,6 +102,7 @@
 
 #include "actions.h"
 #include "analysis_window.h"
+#include "ardour_message.h"
 #include "audio_clock.h"
 #include "audio_region_view.h"
 #include "audio_streamview.h"
@@ -5183,11 +5184,11 @@ Editor::show_rhythm_ferret ()
 void
 Editor::first_idle ()
 {
-	MessageDialog* dialog = 0;
+	ArdourMessageDialog* dialog = 0;
 
 	if (track_views.size() > 1) {
 		Timers::TimerSuspender t;
-		dialog = new MessageDialog (
+		dialog = new ArdourMessageDialog (
 			string_compose (_("Please wait while %1 loads visual data."), PROGRAM_NAME),
 			true
 			);
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index a2ce25224f..9e1a5cb47e 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -160,7 +160,7 @@ Click OK to exit %1."), PROGRAM_NAME, AudioEngine::instance()->current_backend_n
 
 		/* engine has already run, so this is a mid-session backend death */
 
-		MessageDialog msg (string_compose (_("The audio backend (%1) has failed, or terminated"), AudioEngine::instance()->current_backend_name()), false);
+		ArdourMessageDialog msg (string_compose (_("The audio backend (%1) has failed, or terminated"), AudioEngine::instance()->current_backend_name()), false);
 		msg.set_secondary_text (string_compose (_("%2 exited unexpectedly, and without notifying %1."),
 							 PROGRAM_NAME, AudioEngine::instance()->current_backend_name()));
 		msg.run ();