fix logic to reshow strip "name" after a message display

2 files changed, 23 insertions, 9 deletions

diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc
index 188aac07e0..47e14bf73a 100644
--- a/libs/surfaces/mackie/strip.cc
+++ b/libs/surfaces/mackie/strip.cc
@@ -387,18 +387,25 @@ Strip::notify_property_changed (const PropertyChange& what_changed)
 		return;
 	}
 
-	if (_route) {
-		string line1;
-		string fullname = _route->name();
+	show_route_name ();
+}
 
-		if (fullname.length() <= 6) {
-			line1 = fullname;
-		} else {
-			line1 = PBD::short_version (fullname, 6);
-		}
+void
+Strip::show_route_name ()
+{
+	if (!_route) {
+		return;
+	}
+	string line1;
+	string fullname = _route->name();
 
-		_surface->write (display (0, line1));
+	if (fullname.length() <= 6) {
+		line1 = fullname;
+	} else {
+		line1 = PBD::short_version (fullname, 6);
 	}
+
+	_surface->write (display (0, line1));
 }
 
 void
@@ -763,6 +770,7 @@ void
 Strip::periodic (ARDOUR::microseconds_t now)
 {
 	bool reshow_vpot_mode = false;
+	bool reshow_name = false;
 
 	if (!_route) {
 		return;
@@ -779,6 +787,7 @@ Strip::periodic (ARDOUR::microseconds_t now)
 
 		_block_screen_redisplay_until = 0;
 		reshow_vpot_mode = true;
+		reshow_name = true;
 	}
 
 	if (_block_vpot_mode_redisplay_until >= now) {
@@ -791,6 +800,10 @@ Strip::periodic (ARDOUR::microseconds_t now)
 		reshow_vpot_mode = true;
 	}
 
+	if (reshow_name) {
+		show_route_name ();
+	}
+
 	if (reshow_vpot_mode) {
 		return_to_vpot_mode_display ();
 	} else {
diff --git a/libs/surfaces/mackie/strip.h b/libs/surfaces/mackie/strip.h
index 1832871a3b..d810a98d30 100644
--- a/libs/surfaces/mackie/strip.h
+++ b/libs/surfaces/mackie/strip.h
@@ -159,6 +159,7 @@ private:
 	std::vector<Evoral::Parameter> possible_pot_parameters;
 	void next_pot_mode ();
 	void set_vpot_parameter (Evoral::Parameter);
+	void show_route_name ();
 
 	void reset_saved_values ();