From 51fdef419371af1649aaa461a4059f576d6054e7 Mon Sep 17 00:00:00 2001
From: Mark Ganson TheMarkster <39143564+mwganson@users.noreply.github.com>
Date: Sat, 14 Jul 2018 21:25:08 -0500
Subject: [PATCH] save current color so it can be reverted on cancel

---
 src/Mod/Draft/DraftGui.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py
index 7f5908ba1c..a1ea683a39 100644
--- a/src/Mod/Draft/DraftGui.py
+++ b/src/Mod/Draft/DraftGui.py
@@ -1314,8 +1314,10 @@ class DraftToolBar:
 
     def getcol(self):
         "opens a color picker dialog"
+	oldColor = self.color
         self.color=QtGui.QColorDialog.getColor()
 	if not QtGui.QColor.isValid(self.color): #user canceled
+            self.color = oldColor
             return
         self.colorPix.fill(self.color)
         self.colorButton.setIcon(QtGui.QIcon(self.colorPix))
@@ -1336,8 +1338,10 @@ class DraftToolBar:
 
     def getfacecol(self):
         "opens a color picker dialog"
+	oldColor = self.facecolor
         self.facecolor=QtGui.QColorDialog.getColor()
 	if not QtGui.QColor.isValid(self.facecolor): #user canceled
+	    self.facecolor = oldColor
             return
         self.facecolorPix.fill(self.facecolor)
         self.facecolorButton.setIcon(QtGui.QIcon(self.facecolorPix))