X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=datamodel.py;fp=datamodel.py;h=d54f42968273edc0a4d27aaad3faf5eaf9e650c8;hb=4452730c1cdac699ac7edfe98821a68ab0d1a701;hp=2b29fa4b3db328c6d398f63a533c8e7989c7f9b9;hpb=1879265add9b3abfec2d651c452fbf5be20b236d;p=sigrok-meter.git

diff --git a/datamodel.py b/datamodel.py
index 2b29fa4..d54f429 100644
--- 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