do not start editing track/bus names on a single click in the name entry of the track header - require double click; show name label rather than name entry when rec-enabled, to allow using the name area for track selection (name entry would have been visually still available for editing, which is misleading

git-svn-id: svn://localhost/ardour2/branches/3.0@13738 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 7 insertions, 3 deletions

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 94e7d83d19..6898f81bc4 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -229,14 +229,18 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
 		rec_enable_button->show();
  		rec_enable_button->set_controllable (t->rec_enable_control());
 
-		update_rec_display ();
-
                 if (is_midi_track()) {
                         midi_track()->StepEditStatusChange.connect (route_connections, invalidator (*this),
                                                                     boost::bind (&RouteUI::step_edit_changed, this, _1), gui_context());
                 }
 
-	}
+	} 
+
+	/* this will work for busses and tracks, and needs to be called to
+	   set up the name entry/name label display.
+	*/
+
+	update_rec_display ();
 
 	if (is_track()) {
 		boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track>(_route);