From f08642dbc2d68e9a0a06c066ebf4301d23bfeaf7 Mon Sep 17 00:00:00 2001
From: Tom Perkins <thomas.perkins@stfc.ac.uk>
Date: Fri, 24 Jun 2016 12:38:41 +0100
Subject: [PATCH] Make sure list of workspaces contains existing one
re #15518
---
MantidQt/MantidWidgets/src/MuonFitPropertyBrowser.cpp | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/MantidQt/MantidWidgets/src/MuonFitPropertyBrowser.cpp b/MantidQt/MantidWidgets/src/MuonFitPropertyBrowser.cpp
index 3b11ab0698a..cca8dc1dbf4 100644
--- a/MantidQt/MantidWidgets/src/MuonFitPropertyBrowser.cpp
+++ b/MantidQt/MantidWidgets/src/MuonFitPropertyBrowser.cpp
@@ -431,8 +431,14 @@ void MuonFitPropertyBrowser::setParameterValue(const QString &funcIndex,
void MuonFitPropertyBrowser::setWorkspaceNames(const QStringList &wsNames) {
// Extend base class behaviour
IWorkspaceFitControl::setWorkspaceNames(wsNames);
- // Save the names for later use
+
m_workspacesToFit.clear();
+ // If the existing one isn't in the list, add it
+ const std::string currentName = workspaceName();
+ if (!wsNames.contains(QString::fromStdString(currentName))) {
+ m_workspacesToFit.push_back(currentName);
+ }
+ // Now add the other names to the list
std::transform(wsNames.begin(), wsNames.end(),
std::back_inserter(m_workspacesToFit),
[](const QString &qs) { return qs.toStdString(); });
--
GitLab