From cd0c7d2dffbb6c0aa64f704f675b3483c8f75039 Mon Sep 17 00:00:00 2001
From: Applin <robert.applin@stfc.ac.uk>
Date: Sun, 7 Jan 2024 17:10:44 +0000
Subject: [PATCH] Only add workspace index in FSG if it exists

---
 qt/widgets/common/src/FitScriptGeneratorPresenter.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/qt/widgets/common/src/FitScriptGeneratorPresenter.cpp b/qt/widgets/common/src/FitScriptGeneratorPresenter.cpp
index d4b8913422e5..86f9b5682db2 100644
--- a/qt/widgets/common/src/FitScriptGeneratorPresenter.cpp
+++ b/qt/widgets/common/src/FitScriptGeneratorPresenter.cpp
@@ -280,9 +280,12 @@ void FitScriptGeneratorPresenter::setWorkspaces(QStringList const &workspaceName
 void FitScriptGeneratorPresenter::addWorkspaces(std::vector<MatrixWorkspace_const_sptr> const &workspaces,
                                                 FunctionModelSpectra const &workspaceIndices) {
   for (auto const &workspace : workspaces) {
+    auto const maxIndex = workspace->getNumberHistograms() - 1u;
     for (auto const &workspaceIndex : workspaceIndices) {
-      auto const xData = workspace->x(workspaceIndex.value);
-      addWorkspace(workspace, workspaceIndex, xData.front(), xData.back());
+      if (workspaceIndex.value <= maxIndex) {
+        auto const xData = workspace->x(workspaceIndex.value);
+        addWorkspace(workspace, workspaceIndex, xData.front(), xData.back());
+      }
     }
   }
   checkForWarningMessages();