Problem: When canceling the color selection dialog the color of the selected item...

Solution: Add a test whether the color returned from the color dialog is valid.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18245 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/QPrefs.cpp b/src/frontends/qt4/QPrefs.cpp
index e12803cbcdcdae7ff430c9af7d7e3c6f7e784e70..cbc9a373c0a794bb79b8c64c0bfb3d1774822320 100644 (file)
--- a/src/frontends/qt4/QPrefs.cpp
+++ b/src/frontends/qt4/QPrefs.cpp
@@ -578,7 +578,7 @@ void PrefColors::change_color()
        QString color = newcolors_[row];
        QColor c(QColorDialog::getColor(QColor(color), qApp->focusWidget()));
 
-       if (c.name() != color) {
+       if (c.isValid() && c.name() != color) {
                newcolors_[row] = c.name();
                QPixmap coloritem(32, 32);
                coloritem.fill(c);