Merge pull request livecode#2818 from livecodeali/bugfix-15851

livecodefraser · livecodefraser · commit 0ae3a4c64a7a · 2015-09-02T10:02:14.000+01:00
[[ Bug 15851 ]] Fix error returning swatchColor when it is empty
diff --git a/extensions/widgets/colorswatch/colorswatch.lcb b/extensions/widgets/colorswatch/colorswatch.lcb
@@ -208,7 +208,11 @@ public handler setColor(in tColor as optional String) returns nothing
 end handler
 
 public handler getColor() returns String
-	return colorToString(mColor)
+    if mColor is nothing then
+        return ""
+    else
+        return colorToString(mColor)
+    end if
 end handler
 ----------
 
diff --git a/extensions/widgets/colorswatch/notes/15851.md b/extensions/widgets/colorswatch/notes/15851.md
@@ -0,0 +1 @@
+# [15851] error getting swatchColor when it is empty

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# [15851] error getting swatchColor when it is empty`