Move null pointer checks to more sensible place.

Refs #7994
mantidproject · Sep 30, 2013 · 0eaa6a8 · 0eaa6a8
1 parent 8e822ac
commit 0eaa6a8
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/Code/Mantid/MantidPlot/src/Mantid/MantidUI.cpp b/Code/Mantid/MantidPlot/src/Mantid/MantidUI.cpp
@@ -2305,17 +2305,13 @@ MultiLayer* MantidUI::plotBin(const QString& wsName, const QList<int> & binsList
    }
 
    Table *t = createTableFromBins(wsName, ws, binsList, errors);
+   if(!t) return NULL;
    t->confirmClose(false);
    t->setAttribute(Qt::WA_QuitOnClose);
-   MultiLayer* ml(NULL);
-   if( !t )
-   {
-     QApplication::restoreOverrideCursor();
-     return ml;
-   }
 
    // TODO: Use the default style instead of a line if nothing is passed into this method
-   ml = appWindow()->multilayerPlot(t,t->colNames(),style);
+   MultiLayer *ml = appWindow()->multilayerPlot(t,t->colNames(),style);
+   if(!ml) return NULL;
    m->setBinGraph(ml,t);
    ml->confirmClose(false);
    QApplication::restoreOverrideCursor();