X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstartup.cc;h=12f98916bf30188048617390943b32bebd83cf7f;hb=ef4facca1182c4a870addbf2e8eee609afd63b4d;hp=13b9d668e3331b6a89747c590873fd8c19602bb4;hpb=dc36b063bfdfd4a680d6e17b0f8d18b812ba5226;p=ardour.git

diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index 13b9d668e3..12f98916bf 100644
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -25,7 +25,7 @@
 #include <algorithm>
 #include <fcntl.h>
 
-#include <pbd/gstdio_compat.h>
+#include "pbd/gstdio_compat.h"
 
 #include <gtkmm/main.h>
 #include <gtkmm/filechooser.h>
@@ -46,11 +46,12 @@
 #include "ardour/session.h"
 #include "ardour/session_state_utils.h"
 #include "ardour/template_utils.h"
+#include "ardour/profile.h"
 
 #include "startup.h"
 #include "opts.h"
 #include "engine_dialog.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include "utils.h"
 
 using namespace std;
@@ -79,23 +80,23 @@ ArdourStartup::ArdourStartup ()
 	set_position (WIN_POS_CENTER);
 	set_border_width (12);
 
-	if ((icon_pixbuf = ::get_icon ("ardour_icon_48px")) == 0) {
+	if (! (icon_pixbuf = ::get_icon (PROGRAM_NAME "-icon_48px"))) {
 		throw failed_constructor();
 	}
 
 	list<Glib::RefPtr<Gdk::Pixbuf> > window_icons;
 	Glib::RefPtr<Gdk::Pixbuf> icon;
 
-	if ((icon = ::get_icon ("ardour_icon_16px")) != 0) {
+	if ((icon = ::get_icon (PROGRAM_NAME "-icon_16px"))) {
 		window_icons.push_back (icon);
 	}
-	if ((icon = ::get_icon ("ardour_icon_22px")) != 0) {
+	if ((icon = ::get_icon (PROGRAM_NAME "-icon_22px"))) {
 		window_icons.push_back (icon);
 	}
-	if ((icon = ::get_icon ("ardour_icon_32px")) != 0) {
+	if ((icon = ::get_icon (PROGRAM_NAME "-icon_32px"))) {
 		window_icons.push_back (icon);
 	}
-	if ((icon = ::get_icon ("ardour_icon_48px")) != 0) {
+	if ((icon = ::get_icon (PROGRAM_NAME "-icon_48px"))) {
 		window_icons.push_back (icon);
 	}
 	if (!window_icons.empty ()) {
@@ -357,7 +358,9 @@ ArdourStartup::setup_final_page ()
 
 	VBox* vbox = manage (new VBox);
 	vbox->pack_start (*final_label, true, true);
-	vbox->pack_start (plugin_disco_button, true, false);
+	if (!Profile->get_mixbus()) {
+		vbox->pack_start (plugin_disco_button, true, false);
+	}
 	vbox->show ();
 
 	final_page_index = append_page (*vbox);