Merge remote-tracking branch 'origin/feature/8421_muon_dtc_none_on_er…

…ror'
mantidproject · Nov 15, 2013 · 5c02104 · 5c02104
2 parents 559ad69 + 51abbcd
commit 5c02104
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/MuonAnalysis.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/MuonAnalysis.cpp
@@ -1127,7 +1127,10 @@ void MuonAnalysis::inputFileChanged(const QStringList& files)
     catch(std::exception& e)
     {
       QString errorMsg(e.what());
-      errorMsg += "\n\nNo Dead Time correction applied.";
+      errorMsg += "\n\nNo Dead Time correction applied.\n\nReset to None.";
+
+      // Set DTC type to None
+      m_uiForm.deadTimeType->setCurrentIndex(0);
 
       QMessageBox::warning(this, "Mantid - MuonAnalysis", errorMsg);
     }