refs #6500. Check valid colour before setting.

Check that a valid colour has been chosen before setting anything. If cancel is clicked, the colour fetched will not be valid.
mantidproject · Jul 25, 2013 · 6225f87 · 6225f87
1 parent d0bd01a
commit 6225f87
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/Code/Mantid/MantidQt/SliceViewer/src/PeaksWorkspaceWidget.cpp b/Code/Mantid/MantidQt/SliceViewer/src/PeaksWorkspaceWidget.cpp
@@ -124,10 +124,13 @@ namespace MantidQt
     void PeaksWorkspaceWidget::onForegroundColourClicked()
     {
       QColorDialog colourDlg;
+      colourDlg.result();
       QColor selectedColour = colourDlg.getColor();
-
-      ui.btnPeakColor->setBackgroundColor(selectedColour);
-      emit peakColourChanged(this->m_ws, selectedColour);
+      if(selectedColour.isValid() )
+      {
+        ui.btnPeakColor->setBackgroundColor(selectedColour);
+        emit peakColourChanged(this->m_ws, selectedColour);
+      }
     }
 
     /**
@@ -137,8 +140,11 @@ namespace MantidQt
     {
       QColorDialog colourDlg;
       QColor selectedColour = colourDlg.getColor();
-      ui.btnBackgroundColor->setBackgroundColor(selectedColour);
-      emit backgroundColourChanged(this->m_ws, selectedColour);
+      if(selectedColour.isValid() )
+      {
+        ui.btnBackgroundColor->setBackgroundColor(selectedColour);
+        emit backgroundColourChanged(this->m_ws, selectedColour);
+      }
     }
 
     /**