X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_ed.cc;h=9a8fc904e67b1f87dfb50691f62da430fefe4223;hb=65eeeb7a652d7022783b10e35941ce56e0fc7207;hp=de014b0d34c9b9745510de5c5738de524b6d615a;hpb=4cd6d52013dc60d65c2872d9d6e87e83e85cff95;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index de014b0d34..9a8fc904e6 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -68,7 +68,7 @@
 
 #include "control_protocol/control_protocol.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -134,7 +134,6 @@ ARDOUR_UI::install_actions ()
 	global_actions.register_action (main_menu_actions, X_("MixerMenu"), _("Mixer"));
 	global_actions.register_action (main_menu_actions, X_("EditorMenu"), _("Editor"));
 	global_actions.register_action (main_menu_actions, X_("PrefsMenu"), _("Preferences"));
-	global_actions.register_action (main_menu_actions, X_("MastersMenu"), _("Master Faders"));
 	global_actions.register_action (main_menu_actions, X_("DetachMenu"), _("Detach"));
 	global_actions.register_action (main_menu_actions, X_("Help"), _("Help"));
 	global_actions.register_action (main_menu_actions, X_("KeyMouseActions"), _("Misc. Shortcuts"));
@@ -734,6 +733,7 @@ ARDOUR_UI::save_ardour_state ()
 	XMLNode& enode (editor->get_state());
 	XMLNode& mnode (mixer->get_state());
 	XMLNode& bnode (meterbridge->get_state());
+	XMLNode& pnode (rc_option_editor->get_state());
 
 	Config->add_extra_xml (*window_node);
 	Config->add_extra_xml (audio_midi_setup->get_state());
@@ -746,6 +746,7 @@ ARDOUR_UI::save_ardour_state ()
 		_session->add_instant_xml (main_window_node);
 		_session->add_instant_xml (enode);
 		_session->add_instant_xml (mnode);
+		_session->add_instant_xml (pnode);
 		_session->add_instant_xml (bnode);
 		if (location_ui) {
 			_session->add_instant_xml (location_ui->ui().get_state ());
@@ -754,12 +755,17 @@ ARDOUR_UI::save_ardour_state ()
 		Config->add_instant_xml (main_window_node);
 		Config->add_instant_xml (enode);
 		Config->add_instant_xml (mnode);
+		Config->add_instant_xml (pnode);
 		Config->add_instant_xml (bnode);
 		if (location_ui) {
 			Config->add_instant_xml (location_ui->ui().get_state ());
 		}
 	}
+
 	delete &enode;
+	delete &mnode;
+	delete &bnode;
+	delete &pnode;
 
 	Keyboard::save_keybindings ();
 }