Fix a bug with color picking.

Previously, the QColorDialog, returned a invalid QColor if the dialog was
canceled.

diff --git a/datamodel.py b/datamodel.py
index 2b29fa4b3db328c6d398f63a533c8e7989c7f9b9..d54f42968273edc0a4d27aaad3faf5eaf9e650c8 100644 (file)
--- a/datamodel.py
+++ b/datamodel.py
@@ -226,9 +226,11 @@ class MultimeterDelegate(QtGui.QStyledItemDelegate):
                     c = index.data(MeasurementDataModel.colorRole)
                     c = QtGui.QColorDialog.getColor(c, None,
                         'Choose new color for channel')
-
-                    item = model.itemFromIndex(index)
-                    item.setData(c, MeasurementDataModel.colorRole)
+                    if c.isValid():
+                        # False if cancel is pressed (resulting in a black
+                        # color)
+                        item = model.itemFromIndex(index)
+                        item.setData(c, MeasurementDataModel.colorRole)
 
                     return True