refs #6279. Fix. Should return to consistent state.

mantidproject · Dec 11, 2012 · aa786a3 · aa786a3
1 parent de2026a
commit aa786a3
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/Code/Mantid/MantidQt/SliceViewer/src/SliceViewer.cpp b/Code/Mantid/MantidQt/SliceViewer/src/SliceViewer.cpp
@@ -2182,10 +2182,24 @@ void SliceViewer::peakOverlay_toggled(bool checked)
         {
           IPeaksWorkspace_sptr peaksWS = AnalysisDataService::Instance().retrieveWS<IPeaksWorkspace>(list[i].toStdString());
           PeakOverlayViewFactory_sptr viewFactory  = boost::make_shared<PeakOverlayFactory>(m_plot, m_plot->canvas(), m_peaksPresenter->size());
-          m_peaksPresenter->addPeaksPresenter(boost::make_shared<ConcretePeaksPresenter>(viewFactory, peaksWS, transformFactory));
+          try
+          {
+            m_peaksPresenter->addPeaksPresenter(boost::make_shared<ConcretePeaksPresenter>(viewFactory, peaksWS, transformFactory));
+          }
+          catch(std::invalid_argument& e)
+          {
+            // Uncheck the button for consistency.
+            ui.btnPeakOverlay->setChecked(false);
+            throw e;
+          }
         }
         updatePeakOverlaySliderWidget();
       }
+      else
+      {
+        // Uncheck the button for consistency.
+        ui.btnPeakOverlay->setChecked(false);
+      }
     }
   }
   else