From 46277acb40c444139d9e898b7033991ac271e868 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 7 Feb 2020 12:19:27 -0700 Subject: [PATCH] Fix incorrect assignment of MIDNAM device mode --- gtk2_ardour/midi_time_axis.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 7c7ef7b350..4e9af79c79 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -489,8 +489,12 @@ MidiTimeAxisView::model_changed(const std::string& model) _midnam_custom_device_mode_selector.AddMenuElem (Gtk::Menu_Helpers::MenuElem(*i, sigc::bind(sigc::mem_fun(*this, &MidiTimeAxisView::custom_device_mode_changed), *i))); } - if (!device_modes.empty()) { - custom_device_mode_changed(device_modes.front()); + if (gui_property (X_("midnam-custom-device-mode")).empty()) { + if (!device_modes.empty()) { + custom_device_mode_changed (device_modes.front()); + } + } else { + custom_device_mode_changed (gui_property (X_("midnam-custom-device-mode"))); } if (device_modes.size() > 1) {