* settings loader

mooch443 · Sep 20, 2024 · aad7f31 · aad7f31
1 parent 2462167
commit aad7f31
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/Application/src/tracker/gui/SettingsScene.cpp b/Application/src/tracker/gui/SettingsScene.cpp
@@ -350,12 +350,18 @@ struct SettingsScene::Data {
 
                             Print("changed props = ", copy.keys());
                             auto array = SETTING(source).value<file::PathArray>();
-                            auto front = file::Path(file::find_basename(array));
+                            //auto front = file::Path(file::find_basename(array));
 
-                            auto output_file = (not front.has_extension() || front.extension() != "pv") ?
+                            auto output_file = settings::find_output_name(before);
+                            if(not output_file.has_extension() || output_file.extension() != "pv")
+                            {
+                                output_file = output_file.add_extension("pv");
+                            }
+                            /*auto output_file = (not front.has_extension() || front.extension() != "pv") ?
                             file::DataLocation::parse("output", front.add_extension("pv")) :
-                            file::DataLocation::parse("output", front.replace_extension("pv"));
-                            if (output_file.exists()) {
+                            file::DataLocation::parse("output", front.replace_extension("pv"));*/
+                            //if (output_file.exists())
+                            {
                                 SETTING(filename) = file::Path(output_file);
                             }
 

diff --git a/Application/src/tracker/misc/SettingsInitializer.cpp b/Application/src/tracker/misc/SettingsInitializer.cpp
@@ -613,6 +613,12 @@ void load(file::PathArray source,
         } else if(path.is_absolute()) {
             combined.map["filename"] = file::Path(path.filename());
             set_config_if_different("filename", combined.map);
+        } else {
+#ifndef NDEBUG
+            Print("Not absolute: ", path);
+#endif
+            combined.map["filename"] = file::Path(path);
+            set_config_if_different("filename", combined.map);
         }
     }