summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/ardour_ui2.cc5
-rw-r--r--gtk2_ardour/ardour_ui_ed.cc1
-rw-r--r--gtk2_ardour/ardour_ui_options.cc2
3 files changed, 5 insertions, 3 deletions
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index ff4b84467f..ad181653b5 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -835,7 +835,10 @@ void
ARDOUR_UI::sync_option_changed ()
{
if (session) {
- session->request_slave_source (string_to_slave_source (sync_option_combo.get_active_text()));
+ ustring txt = sync_option_combo.get_active_text ();
+ if (txt.length()) {
+ session->request_slave_source (string_to_slave_source (txt));
+ }
}
}
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index fbb700e20e..15cbc6d58f 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -80,7 +80,6 @@ ARDOUR_UI::install_actions ()
/* menus + submenus that need action items */
ActionManager::register_action (main_actions, X_("Session"), _("Session"));
- ActionManager::register_action (main_actions, X_("Export"), _("Export"));
ActionManager::register_action (main_actions, X_("Cleanup"), _("Cleanup"));
ActionManager::register_action (main_actions, X_("Sync"), _("Sync"));
ActionManager::register_action (main_actions, X_("Options"), _("Options"));
diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc
index 4a6bef6b5f..e6a31d58cf 100644
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -515,7 +515,7 @@ ARDOUR_UI::mtc_port_changed ()
positional_sync_strings.push_back (slave_source_to_string (MTC));
}
positional_sync_strings.push_back (slave_source_to_string (JACK));
-
+
set_popdown_strings (sync_option_combo, positional_sync_strings);
}