dynamic_cast, updateSecondaryAxis(), issues 1075799,800,803, re #11152

mantidproject · Feb 22, 2015 · 27a4b6e · 27a4b6e
1 parent 9bdd252
commit 27a4b6e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/Code/Mantid/MantidPlot/src/Graph.cpp b/Code/Mantid/MantidPlot/src/Graph.cpp
@@ -954,7 +954,7 @@ void Graph::updateSecondaryAxis(int axis)
 
     if (it->rtti() == QwtPlotItem::Rtti_PlotSpectrogram){
       Spectrogram *sp = dynamic_cast<Spectrogram *>(it);
-      if (sp->colorScaleAxis() == axis)
+      if (!sp || sp->colorScaleAxis() == axis)
         return;
     }
 
@@ -971,7 +971,10 @@ void Graph::updateSecondaryAxis(int axis)
     return;
 
   ScaleEngine *sc_engine = dynamic_cast<ScaleEngine *>(d_plot->axisScaleEngine(axis));
-  sc_engine->clone(dynamic_cast<ScaleEngine *>(d_plot->axisScaleEngine(a)));
+  if (sc_engine) {
+    ScaleEngine *a_engine = dynamic_cast<ScaleEngine *>(d_plot->axisScaleEngine(a));
+    sc_engine->clone(a_engine);
+  }
 
   /*QwtScaleEngine *qwtsc_engine = d_plot->axisScaleEngine(axis);
 	ScaleEngine *sc_engine=dynamic_cast<ScaleEngine*>(qwtsc_engine);