From fdeed5dec48748acf8e3bfcbe48f158c378f3183 Mon Sep 17 00:00:00 2001
From: Andreas Suter <andreas.suter@psi.ch>
Date: Tue, 24 Oct 2023 21:09:35 +0200
Subject: [PATCH] (i) fix of missing status init. (ii) changed vector copy
 evaluation.

---
 src/musredit_qt5/mupp/PmuppScript.cpp | 10 +++++++---
 src/musredit_qt6/mupp/PmuppScript.cpp | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/musredit_qt5/mupp/PmuppScript.cpp b/src/musredit_qt5/mupp/PmuppScript.cpp
index 76d2b5c5..8783e673 100644
--- a/src/musredit_qt5/mupp/PmuppScript.cpp
+++ b/src/musredit_qt5/mupp/PmuppScript.cpp
@@ -73,6 +73,7 @@ int PmuppScript::executeScript()
   QString cmd;
   int status;
   for (int i=0; i<fScript.size(); i++) {
+    status = 0;
     cmd = fScript.at(i);
     if (cmd.startsWith("loadPath")) {
       setLoadPath(cmd);
@@ -637,7 +638,8 @@ int PmuppScript::macro(const QString str, const QString plotFln)
 #if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
       xx = QVector<double>::fromStdVector(fVarHandler[idx].getValues());
 #else
-      QVector<double> qvec(fVarHandler[idx].getValues().begin(), fVarHandler[idx].getValues().end());
+      std::vector<double> xVal = fVarHandler[idx].getValues();
+      QVector<double> qvec(xVal.begin(), xVal.end());
       xx = qvec;
 #endif
     }
@@ -670,9 +672,11 @@ int PmuppScript::macro(const QString str, const QString plotFln)
         yyPosErr = QVector<double>::fromStdVector(fVarHandler[idx].getErrors());
         yyNegErr = QVector<double>::fromStdVector(fVarHandler[idx].getErrors());
 #else
-        QVector<double> qvecV(fVarHandler[idx].getValues().begin(), fVarHandler[idx].getValues().end());
+        std::vector<double> yVal = fVarHandler[idx].getValues();
+        QVector<double> qvecV(yVal.begin(), yVal.end());
         yy = qvecV;
-        QVector<double> qvecE(fVarHandler[idx].getErrors().begin(), fVarHandler[idx].getErrors().end());
+        std::vector<double> yErr = fVarHandler[idx].getErrors();
+        QVector<double> qvecE(yErr.begin(), yErr.end());
         yyPosErr = qvecE;
         yyNegErr = qvecE;
 #endif
diff --git a/src/musredit_qt6/mupp/PmuppScript.cpp b/src/musredit_qt6/mupp/PmuppScript.cpp
index 27418a0b..4d9ddafb 100644
--- a/src/musredit_qt6/mupp/PmuppScript.cpp
+++ b/src/musredit_qt6/mupp/PmuppScript.cpp
@@ -73,6 +73,7 @@ int PmuppScript::executeScript()
   QString cmd;
   int status;
   for (int i=0; i<fScript.size(); i++) {
+    status = 0;
     cmd = fScript.at(i);
     if (cmd.startsWith("loadPath")) {
       setLoadPath(cmd);
@@ -584,7 +585,8 @@ int PmuppScript::macro(const QString str, const QString plotFln)
         std::cerr << "          This should never happens." << std::endl;
         return -3;
       }
-      QVector<double> qvec(fVarHandler[idx].getValues().begin(), fVarHandler[idx].getValues().end());
+      std::vector<double> xVal = fVarHandler[idx].getValues();
+      QVector<double> qvec(xVal.begin(), xVal.end());
       xx = qvec;
     }
     // get x-axis min/max
@@ -611,9 +613,11 @@ int PmuppScript::macro(const QString str, const QString plotFln)
           std::cerr << "          This should never happens." << std::endl;
           return -3;
         }
-        QVector<double> qvecV(fVarHandler[idx].getValues().begin(), fVarHandler[idx].getValues().end());
+        std::vector<double> yVal = fVarHandler[idx].getValues();
+        QVector<double> qvecV(yVal.begin(), yVal.end());
         yy = qvecV;
-        QVector<double> qvecE(fVarHandler[idx].getErrors().begin(), fVarHandler[idx].getErrors().end());
+        std::vector<double> yErr = fVarHandler[idx].getErrors();
+        QVector<double> qvecE(yErr.begin(), yErr.end());
         yyPosErr = qvecE;
         yyNegErr = qvecE;
       }