Improve error handling of python envs

HSLdevcom · Feb 3, 2025 · 18f8076 · 18f8076
1 parent f8ec02c
commit 18f8076
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/renderer/components/App.jsx b/src/renderer/components/App.jsx
@@ -157,7 +157,12 @@ const App = ({helmetUIVersion, versions, searchEMMEPython}) => {
     setProjectPath(existingProjectPath);
     setBasedataPath(existingBasedataPath);
     setResultsPath(existingResultsPath);
-    setEmmePythonEnvs(existingPythonEnvs);
+
+    if(Array.isArray(existingPythonEnvs)) {
+      setEmmePythonEnvs(existingPythonEnvs);
+    } else {
+      setEmmePythonEnvs([]);
+    }
 
     //If Emme version is uninitialized, fetch version from config file
     if(existingEmmeVersion === undefined) {

diff --git a/src/renderer/components/Settings/Settings.jsx b/src/renderer/components/Settings/Settings.jsx
@@ -90,7 +90,7 @@ const Settings = ({
          closeEditing={() => setShowEmmeDialog(false)} /> }
         <div className="Settings__dialog-input-group">
           <span className="Settings__pseudo-label">Käytettävät Python-ympäristöt:</span>
-          { emmePythonEnvs && (emmePythonEnvs.map((env, index) => { return (
+          { Array.isArray(emmePythonEnvs) && emmePythonEnvs.length > 0 && (emmePythonEnvs.map((env, index) => { return (
             <div>
               <EnvironmentOption envPath={env} isSelected={emmePythonPath === env}
              setPath={setEMMEPythonPath}