use VCA full name in strips and track headers

[ardour.git] / gtk2_ardour / generic_pluginui.cc

diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc
index 4e0492999a93fc87cab12bbc7fe61db49b0101db..066aa95fa88b366b4fbfc568b406c2c7c302b9e0 100644 (file)
--- a/gtk2_ardour/generic_pluginui.cc
+++ b/gtk2_ardour/generic_pluginui.cc
@@ -273,8 +273,6 @@ GenericPluginUI::build ()
                        }
 
                        control_uis.push_back(cui);
-               } else {
-                       grid = false;
                }
        }
 
@@ -850,7 +848,7 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter&             param,
                        input_controls_with_automation.push_back (control_ui);
                }
 
-               if (desc.toggled) {
+               if (desc.toggled && !control_ui->combo) {
                        control_ui->button = true;
                        ArdourButton* but = dynamic_cast<ArdourButton*>(control_ui->controller->widget ());
                        assert (but);
@@ -987,9 +985,7 @@ void
 GenericPluginUI::set_all_automation (AutoState as)
 {
        for (vector<ControlUI*>::iterator i = input_controls_with_automation.begin(); i != input_controls_with_automation.end(); ++i) {
-               if ((*i)->controller || (*i)->button) {
-                       set_automation_state (as, (*i));
-               }
+               set_automation_state (as, (*i));
        }
 }