From 90c43c8d53c4e50f09cf3bf6bc8518e0d27b8e57 Mon Sep 17 00:00:00 2001
From: Majin Sniper <majinsniper@gmx.de>
Date: Sat, 14 Mar 2009 14:50:10 +0100
Subject: Fix cancel button in color config dialog

Also save the committed gradient, not the one currently used.
---
 src/gui/palette.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/gui/palette.cpp')

diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp
index 80b5f1f1..162081e1 100644
--- a/src/gui/palette.cpp
+++ b/src/gui/palette.cpp
@@ -143,7 +143,7 @@ Palette::~Palette()
          colEnd = mColVector.end(); col != colEnd; ++col)
     {
         configName = &ColorTypeNames[col->type];
-        config.setValue(*configName + "Gradient", col->grad);
+        config.setValue(*configName + "Gradient", col->comittedGrad);
         if (col->grad == STATIC)
         {
             config.setValue(*configName, toString(col->getRGB()));
@@ -235,11 +235,12 @@ void Palette::rollback()
          i != iEnd;
          ++i)
     {
-        i->grad = i->committedGrad;
-        if (i->grad == STATIC)
+        if (i->grad != i->committedGrad)
         {
-            i->color = i->committedColor;
+            setGradient(i->type, i->committedGrad);
         }
+        setColor(i->type, i->committedColor.r, i->committedColor.g,
+                i->committedColor.b);
     }
 }
 
-- 
cgit v1.2.3-70-g09d2