OSC: Changed gainVCA to gainfader as VCA is already used.

[ardour.git] / gtk2_ardour / ardour_ui_ed.cc

diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 1d9689e608ccca5361296754a4f3449225a3e567..3382a3f3d86def843ad982663e6c5c24bf6a430e 100644 (file)
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -530,7 +530,7 @@ ARDOUR_UI::install_actions ()
        shuttle_actions->add (Action::create (X_("SetShuttleUnitsPercentage"), _("Percentage")), hide_return (sigc::bind (sigc::mem_fun (*Config, &RCConfiguration::set_shuttle_units), Percentage)));
        shuttle_actions->add (Action::create (X_("SetShuttleUnitsSemitones"), _("Semitones")), hide_return (sigc::bind (sigc::mem_fun (*Config, &RCConfiguration::set_shuttle_units), Semitones)));
 
-       Glib::RefPtr<ActionGroup> option_actions = global_actions.create_action_group ("options");
+       Glib::RefPtr<ActionGroup> option_actions = global_actions.create_action_group ("Options");
 
        act = global_actions.register_toggle_action (option_actions, X_("SendMTC"), _("Send MTC"), sigc::mem_fun (*this, &ARDOUR_UI::toggle_send_mtc));
        ActionManager::session_sensitive_actions.push_back (act);
@@ -702,11 +702,11 @@ ARDOUR_UI::save_ardour_state ()
 
        string current_tab;
        int current_page_number = _tabs.get_current_page ();
-       if (editor && (current_page_number == _tabs.page_num (editor->contents()))) {
+       if (current_page_number == _tabs.page_num (editor->contents())) {
                current_tab = "editor";
-       } else if (mixer && (current_page_number == _tabs.page_num (mixer->contents()))) {
+       } else if (current_page_number == _tabs.page_num (mixer->contents())) {
                current_tab = "mixer";
-       } else if (rc_option_editor && (current_page_number == _tabs.page_num (rc_option_editor->contents()))) {
+       } else if (current_page_number == _tabs.page_num (rc_option_editor->contents())) {
                current_tab == "preferences";
        }