From ee43db8b5410ce3a6b1215c7cf943186c35e76e0 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 5 Feb 2020 12:48:57 -0700 Subject: revert/change part of a666429d12 so that user-selected non-plugin MIDNAM model names are still shown (they were already used) --- gtk2_ardour/midi_time_axis.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gtk2_ardour/midi_time_axis.cc') diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index fb6cfe9aa6..d682ffe745 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -430,11 +430,12 @@ MidiTimeAxisView::update_patch_selector () if (pi && pi->plugin ()->has_midnam ()) { std::string model_name = pi->plugin ()->midnam_model (); if (gui_property (X_("midnam-model-name")) != model_name) { - /* ensure that "Plugin Provided" is prefixed at the top of the list */ - if (_midnam_model_selector.items().empty () || _midnam_model_selector.items().begin()->get_label() != _("Plugin Provided")) { - setup_midnam_patches (); - } - model_changed (model_name); + /* user changed the MIDNAM model to something + other than the plugin provided one. We + should use that, and not the "plugin + provided" label. + */ + model_changed (gui_property (X_("midnam-model-name"))); } } } -- cgit v1.2.3