Merge pull request #37 from KAHR-Alpha/bugfix/load_script_crash

Bugfix/load script crash
KAHR-Alpha · Apr 20, 2024 · 97a5057 · 97a5057
2 parents 412fb96 + 274dde5
commit 97a5057
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,7 @@ endfunction()
 
 set(CPACK_PACKAGE_VERSION_MAJOR 0)
 set(CPACK_PACKAGE_VERSION_MINOR 14)
-set(CPACK_PACKAGE_VERSION_PATCH 1)
+set(CPACK_PACKAGE_VERSION_PATCH 2)
 
 set(TASK "Build CLI" CACHE STRING "What to do")
 set_property(CACHE TASK PROPERTY STRINGS "Build CLI" "Build CLI+GUI")

diff --git a/src/GUI/Materials/gui_material_library.cpp b/src/GUI/Materials/gui_material_library.cpp
@@ -640,11 +640,31 @@ GUI::Material* MaterialsLib::load_script(std::filesystem::path const &path)
     }
 
     for(std::size_t i=0;i<data.size();i++)
-        if(std::filesystem::equivalent(path,data[i]->script_path))
+    {
+        if(data[i]->script_path.empty()) continue;
+
+        std::error_code error;
+        if(!std::filesystem::exists(data[i]->script_path, error))
+        {
+            if(error)
+            {
+                wxMessageBox(data[i]->script_path.generic_string()+": "+error.message(), "File access error");
+            }
+
+            continue;
+        }
+
+        if(std::filesystem::equivalent(path,data[i]->script_path, error))
         {
             wxMessageBox("Duplicate material","Error");
             return nullptr;
         }
+
+        if(error)
+        {
+            wxMessageBox(data[i]->script_path.generic_string()+": "+error.message(), "File access error");
+        }
+    }
 
     GUI::Material *new_data=new GUI::Material;
     new_data->type=MatType::SCRIPT;