harmonise path slashes ref #14134

Signed-off-by: m-kro <[email protected]>
eclipse-sumo · Dec 11, 2023 · af3e65b · af3e65b
1 parent 1475ab2
commit af3e65b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/src/netedit/tools/GNENetDiffTool.cpp b/src/netedit/tools/GNENetDiffTool.cpp
@@ -96,6 +96,10 @@ GNENetDiffTool::getCommand() const {
     std::string sumoHome = "";
     if (sumoHomeEnv != nullptr && sumoHomeEnv != std::string("")) {
         sumoHome = std::string(sumoHomeEnv);
+        // harmonise slash
+        if (sumoHome.back() == '\\') {
+            sumoHome = sumoHome.substr(0, sumoHome.size() - 1);
+        }
         // quote string to handle spaces but prevent double quotes
         if (sumoHome.front() != '"') {
             sumoHome = "\"" + sumoHome;

diff --git a/src/netedit/tools/GNEPythonTool.cpp b/src/netedit/tools/GNEPythonTool.cpp
@@ -103,6 +103,10 @@ GNEPythonTool::getCommand() const {
     std::string sumoHome = "";
     if (sumoHomeEnv != nullptr && sumoHomeEnv != std::string("")) {
         sumoHome = std::string(sumoHomeEnv);
+        // harmonise slash
+        if (sumoHome.back() == '\\') {
+            sumoHome = sumoHome.substr(0, sumoHome.size() - 1);
+        }
         // quote string to handle spaces but prevent double quotes
         if (sumoHome.front() != '"') {
             sumoHome = "\"" + sumoHome;

diff --git a/src/netedit/tools/GNERunNetgenerate.cpp b/src/netedit/tools/GNERunNetgenerate.cpp
@@ -52,6 +52,10 @@ GNERunNetgenerate::run(const OptionsCont* netgenerateOptions) {
     std::string sumoHome = "";
     if (sumoHomeEnv != nullptr && sumoHomeEnv != std::string("")) {
         sumoHome = std::string(sumoHomeEnv);
+        // harmonise slash
+        if (sumoHome.back() == '\\') {
+            sumoHome = sumoHome.substr(0, sumoHome.size() - 1);
+        }
         // prevent double quotes
         if (sumoHome.front() == '"') {
             sumoHome.erase(sumoHome.begin());