From 98a5780d6df3777dbc3fe44e68b40cba541e34ff Mon Sep 17 00:00:00 2001
From: Maurus Cuelenaere <mcuelenaere@gmail.com>
Date: Tue, 15 Jun 2010 11:06:40 +0000
Subject: Theme editor: only accept valid colors in the preference dialog

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26857 a1c6a512-1295-4272-9138-f99709370657
---
 utils/themeeditor/preferencesdialog.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'utils/themeeditor/preferencesdialog.cpp')

diff --git a/utils/themeeditor/preferencesdialog.cpp b/utils/themeeditor/preferencesdialog.cpp
index 78f2ed7206..8cd9665779 100644
--- a/utils/themeeditor/preferencesdialog.cpp
+++ b/utils/themeeditor/preferencesdialog.cpp
@@ -165,7 +165,7 @@ void PreferencesDialog::setupUI()
 
 void PreferencesDialog::colorClicked()
 {
-    QColor* toEdit = 0;
+    QColor* toEdit = 0, newColor;
 
     if(QObject::sender() == ui->bgButton)
         toEdit = &bgColor;
@@ -185,8 +185,12 @@ void PreferencesDialog::colorClicked()
     if(!toEdit)
         return;
 
-    *toEdit = QColorDialog::getColor(*toEdit, this);
-    setButtonColor(dynamic_cast<QPushButton*>(QObject::sender()), *toEdit);
+    newColor = QColorDialog::getColor(*toEdit, this);
+    if (newColor.isValid())
+    {
+        *toEdit = newColor;
+        setButtonColor(dynamic_cast<QPushButton*>(QObject::sender()), *toEdit);
+    }
 }
 
 void PreferencesDialog::accept()
-- 
cgit v1.2.3