fix #14469

eclipse-sumo · Mar 11, 2024 · 3737b7b · 3737b7b
1 parent d33d119
commit 3737b7b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/src/netedit/tools/GNENetDiffTool.cpp b/src/netedit/tools/GNENetDiffTool.cpp
@@ -98,19 +98,21 @@ GNENetDiffTool::getCommand() const {
         sumoHome = std::string(sumoHomeEnv);
         // harmonise slash
         if (sumoHome.back() == '\\') {
-            sumoHome = sumoHome.substr(0, sumoHome.size() - 1);
+            sumoHome.pop_back();
+        }
+        if (sumoHome.back() != '/') {
+            sumoHome += "/";
         }
         // quote string to handle spaces but prevent double quotes
         if (sumoHome.front() != '"') {
             sumoHome = "\"" + sumoHome;
         }
-        if (sumoHome.back() != '"') {
-            sumoHome += "\"";
+        if (sumoHome.back() == '"') {
+            sumoHome.pop_back();
         }
-        sumoHome += "/";
     }
     // get command
-    std::string command = python + " " + sumoHome + myToolPath;
+    std::string command = python + " " + sumoHome + myToolPath + "\"";
     // declare arguments
     std::string arguments;
     // add arguments

diff --git a/src/netedit/tools/GNEPythonTool.cpp b/src/netedit/tools/GNEPythonTool.cpp
@@ -105,19 +105,21 @@ GNEPythonTool::getCommand() const {
         sumoHome = std::string(sumoHomeEnv);
         // harmonise slash
         if (sumoHome.back() == '\\') {
-            sumoHome = sumoHome.substr(0, sumoHome.size() - 1);
+            sumoHome.pop_back();
+        }
+        if (sumoHome.back() != '/') {
+            sumoHome += "/";
         }
         // quote string to handle spaces but prevent double quotes
         if (sumoHome.front() != '"') {
             sumoHome = "\"" + sumoHome;
         }
-        if (sumoHome.back() != '"') {
-            sumoHome += "\"";
+        if (sumoHome.back() == '"') {
+            sumoHome.pop_back();
         }
-        sumoHome += "/";
     }
     // get command
-    std::string command = python + " " + sumoHome + myToolPath;
+    std::string command = python + " " + sumoHome + myToolPath + "\"";
     // declare arguments
     std::string arguments;
     // add arguments