Merge branch 'bugfix/10125_add_save_button_to_workspace_list' into de…

…velop

Conflicts:
	Code/Mantid/MantidPlot/src/Mantid/MantidDock.cpp

Refs #10125

Code/Mantid/MantidPlot/src/Mantid/MantidDock.cpp

@@ -60,11 +60,12 @@ MantidDockWidget::MantidDockWidget(MantidUI *mui, ApplicationWindow *parent) :
 
   if(m_groupButton)
     m_groupButton->setEnabled(false);
+
   buttonLayout->addWidget(m_loadButton);
-  buttonLayout->addWidget(m_saveButton);
   buttonLayout->addWidget(m_deleteButton);
   buttonLayout->addWidget(m_groupButton);
   buttonLayout->addWidget(m_sortButton);
+  buttonLayout->addWidget(m_saveButton);
 
   m_workspaceFilter = new MantidQt::MantidWidgets::LineEditWithClear();
   m_workspaceFilter->setPlaceholderText("Filter Workspaces");  
@@ -79,7 +80,6 @@ MantidDockWidget::MantidDockWidget(MantidUI *mui, ApplicationWindow *parent) :
   layout->addLayout(buttonLayout);
   layout->addWidget(m_workspaceFilter);
   layout->addWidget(m_tree);
-
 
   m_loadMenu = new QMenu(this);
 
@@ -95,7 +95,7 @@ MantidDockWidget::MantidDockWidget(MantidUI *mui, ApplicationWindow *parent) :
   m_loadMenu->addAction(liveDataAction);
   m_loadButton->setMenu(m_loadMenu);
 
-  // Dialog box used for user to specify fodler to save multiple workspaces into
+  // Dialog box used for user to specify folder to save multiple workspaces into
   m_saveFolderDialog = new QFileDialog;
   m_saveFolderDialog->setFileMode(QFileDialog::DirectoryOnly);
   m_saveFolderDialog->setOption(QFileDialog::ShowDirsOnly);
@@ -822,9 +822,17 @@ void MantidDockWidget::saveWorkspacesToFolder(const QString &folder)
 
     IAlgorithm_sptr saveAlg = AlgorithmManager::Instance().create("SaveNexus");
     saveAlg->initialize();
-    saveAlg->setProperty("InputWorkspace", workspaceName.toStdString());
-    saveAlg->setProperty("Filename", filename.toStdString());
-    saveAlg->execute();
+    try
+    {
+      saveAlg->setProperty("InputWorkspace", workspaceName.toStdString());
+      saveAlg->setProperty("Filename", filename.toStdString());
+      saveAlg->execute();
+    }
+    catch(std::runtime_error &rte)
+    {
+      docklog.error() << "Error saving workspace " << workspaceName.toStdString()
+        << ": " << rte.what() << std::endl;
+    }
   }
 }