From: Ben Loftis <ben@harrisonconsoles.com>
Date: Tue, 28 Feb 2017 02:51:04 +0000 (-0600)
Subject: Likely fix for bug: cannot change track colors in older 4.x sessions.
X-Git-Tag: 5.9~712
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;ds=sidebyside;h=1071c0e788cb8b87d9fd034862892bd30ab26ab6;p=ardour.git

Likely fix for bug: cannot change track colors in older 4.x sessions.
---

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 1ce6114a3e..0e1a047833 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -259,6 +259,41 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
 
 	_route = rp;
 
+	if ( !_route->presentation_info().color_set() ) {
+		/* deal with older 4.x color, which was stored in the GUI object state */
+
+		string p = ARDOUR_UI::instance()->gui_object_state->get_string (route_state_id(), X_("color"));
+
+		if (!p.empty()) {
+
+			/* old v4.x or earlier session. Use this information */
+
+			int red, green, blue;
+			char colon;
+
+			stringstream ss (p);
+
+			/* old color format version was:
+
+			   16bit value for red:16 bit value for green:16 bit value for blue
+
+			   decode to rgb ..
+			*/
+
+			ss >> red;
+			ss >> colon;
+			ss >> green;
+			ss >> colon;
+			ss >> blue;
+
+			red >>= 2;
+			green >>= 2;
+			blue >>= 2;
+
+			_route->presentation_info().set_color (RGBA_TO_UINT (red, green, blue, 255));
+		}
+	}
+
 	if (set_color_from_route()) {
 		set_color (gdk_color_to_rgba (AxisView::unique_random_color ()));
 	}
@@ -2175,40 +2210,6 @@ RouteUI::route_color () const
 	if (g && g->is_color()) {
 		set_color_from_rgba (c, GroupTabs::group_color (g));
 	} else {
-
-		/* deal with older 4.x color, which was stored in the GUI object state */
-
-		string p = ARDOUR_UI::instance()->gui_object_state->get_string (route_state_id(), X_("color"));
-
-		if (!p.empty()) {
-
-			/* old v4.x or earlier session. Use this information */
-
-			int red, green, blue;
-			char colon;
-
-			stringstream ss (p);
-
-			/* old color format version was:
-
-			   16bit value for red:16 bit value for green:16 bit value for blue
-
-			   decode to rgb ..
-			*/
-
-			ss >> red;
-			ss >> colon;
-			ss >> green;
-			ss >> colon;
-			ss >> blue;
-
-			red >>= 2;
-			green >>= 2;
-			blue >>= 2;
-
-			_route->presentation_info().set_color (RGBA_TO_UINT (red, green, blue, 255));
-		}
-
 		set_color_from_rgba (c, _route->presentation_info().color());
 	}