Display ICAT error on GUI. Refs #9208.

mantidproject · Mar 28, 2014 · ce2437c · ce2437c
1 parent 2dd4d5c
commit ce2437c
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/Code/Mantid/MantidQt/CustomDialogs/src/CatalogPublishDialog.cpp b/Code/Mantid/MantidQt/CustomDialogs/src/CatalogPublishDialog.cpp
@@ -58,7 +58,22 @@ namespace MantidQt
 
       // This again is a temporary measure to ensure publishing functionality will work with one catalog.
       auto session = Mantid::API::CatalogManager::Instance().getActiveSessions();
-      if (!session.empty()) Mantid::API::CatalogManager::Instance().getCatalog(session.front()->getSessionId())->myData(workspace);
+
+      // We need to catch the exception to prevent a fatal error.
+      try
+      {
+        if (!session.empty())
+        {
+          Mantid::API::CatalogManager::Instance().getCatalog(session.front()->getSessionId())->myData(workspace);
+        }
+      }
+      catch(std::runtime_error& e)
+      {
+        setOptionalMessage(e.what());
+        m_uiForm.scrollArea->setDisabled(true);
+        m_uiForm.runBtn->setDisabled(true);
+        return;
+      }
 
       // The user is not an investigator on any investigations and cannot publish
       // or they are not logged into the catalog then update the related message..