Refs #9007 Use a better way of flagging a file problem.

mantidproject · Mar 12, 2014 · f8efaff · f8efaff
1 parent 6b91569
commit f8efaff
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/Code/Mantid/MantidQt/MantidWidgets/src/DataSelector.cpp b/Code/Mantid/MantidQt/MantidWidgets/src/DataSelector.cpp
@@ -113,6 +113,11 @@ namespace MantidQt
             loadAlg->execute();
 
             isValid = AnalysisDataService::Instance().doesExist(wsName.toStdString());
+
+            if(!isValid)
+            {
+              m_uiForm.rfFileInput->setFileProblem("The specified workspace is missing from the analysis data service");
+            }
           }
         }
       }
@@ -135,11 +140,7 @@ namespace MantidQt
       QString problem = "";
       const QString wsName = getCurrentDataName();
 
-      if(m_autoLoad && !AnalysisDataService::Instance().doesExist(wsName.toStdString()))
-      {
-        problem = "The specified workspace is missing from the analysis data service";
-      }
-      else if(isFileSelectorVisible())
+      if(isFileSelectorVisible())
       {
         problem = m_uiForm.rfFileInput->getFileProblem();
       }