From edb379eafdb11021a51ede9265d51b7e8368769c Mon Sep 17 00:00:00 2001
From: Dalton Messmer <33463986+messmerd@users.noreply.github.com>
Date: Sun, 6 Nov 2022 23:33:30 -0500
Subject: [PATCH] Fix pattern clip colors from pre-1.3 versions (#6563)

---
 src/core/PatternClip.cpp | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/core/PatternClip.cpp b/src/core/PatternClip.cpp
index 7ea56cd48..9af9bda6a 100644
--- a/src/core/PatternClip.cpp
+++ b/src/core/PatternClip.cpp
@@ -83,19 +83,20 @@ void PatternClip::loadSettings(const QDomElement& element)
 		toggleMute();
 	}
 	
-	// for colors saved in 1.3-onwards
-	if( element.hasAttribute( "color" ) && !element.hasAttribute( "usestyle" ) )
+	if (element.hasAttribute("color"))
 	{
-		useCustomClipColor( true );
-		setColor( element.attribute( "color" ) );
-	}
-	
-	// for colors saved before 1.3
-	else if(element.hasAttribute("color"))
-	{
-		setColor(QColor(element.attribute("color").toUInt()));
-		
-		// usestyle attribute is no longer used
+		if (!element.hasAttribute("usestyle"))
+		{
+			// for colors saved in 1.3-onwards
+			setColor(element.attribute("color"));
+			useCustomClipColor(true);
+		}
+		else
+		{
+			// for colors saved before 1.3
+			setColor(QColor(element.attribute("color").toUInt()));
+			useCustomClipColor(element.attribute("usestyle").toUInt() == 0);
+		}
 	}
 	else
 	{