File chooser path fixes

obsidian-level-maker · Jun 29, 2024 · a775f54 · a775f54
1 parent b716a61
commit a775f54
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 10 deletions.
diff --git a/source/g_wolf.cc b/source/g_wolf.cc
@@ -418,7 +418,7 @@ bool wolf_game_interface_c::Start(const char *ext)
 
         chooser.title(_("Select output directory"));
 
-        chooser.directory(BestDirectory().c_str());
+        chooser.directory(SanitizePath(BestDirectory()).c_str());
 
         chooser.type(Fl_Native_File_Chooser::BROWSE_DIRECTORY);
 

diff --git a/source/lib_util.cc b/source/lib_util.cc
@@ -235,6 +235,19 @@ std::string PathAppend(std::string_view parent, std::string_view child)
     return new_path;
 }
 
+std::string SanitizePath(std::string_view path)
+{
+    std::string sani_path;
+    for (const char ch : path)
+    {
+        if (ch == '\\')
+            sani_path.push_back('/');
+        else
+            sani_path.push_back(ch);
+    }
+    return sani_path;
+}
+
 std::string GetDirectory(std::string_view path)
 {
     SYS_ASSERT(!path.empty());

diff --git a/source/lib_util.h b/source/lib_util.h
@@ -34,6 +34,7 @@ std::string GetExtension(std::string_view path);
 std::string PathAppend(std::string_view parent, std::string_view child);
 bool        IsPathAbsolute(std::string_view path);
 void        ReplaceExtension(std::string &path, std::string_view ext);
+std::string SanitizePath(std::string_view path);
 
 std::string CurrentDirectoryGet();
 bool        MakeDirectory(std::string_view dir);

diff --git a/source/m_dialog.cc b/source/m_dialog.cc
@@ -255,7 +255,7 @@ std::string DLG_OutputFilename(const char *ext, const char *preset)
 
     chooser.filter(kind_buf.c_str());
 
-    auto best_dir = BestDirectory();
+    std::string best_dir = SanitizePath(BestDirectory());
 
     if (preset)
     {
@@ -633,7 +633,7 @@ tryagain:;
 
     if (!last_directory.empty())
     {
-        chooser.directory(last_directory.c_str());
+        chooser.directory(SanitizePath(last_directory).c_str());
     }
 
     switch (chooser.show())

diff --git a/source/m_manage.cc b/source/m_manage.cc
@@ -413,11 +413,11 @@ class UI_Manage_Config : public Fl_Double_Window
 
         if (!last_directory.empty())
         {
-            chooser.directory(last_directory.c_str());
+            chooser.directory(SanitizePath(last_directory).c_str());
         }
         else
         {
-            chooser.directory(install_dir.c_str());
+            chooser.directory(SanitizePath(install_dir).c_str());
         }
 
         switch (chooser.show())
@@ -479,11 +479,11 @@ class UI_Manage_Config : public Fl_Double_Window
 
         if (!last_directory.empty())
         {
-            chooser.directory(last_directory.c_str());
+            chooser.directory(SanitizePath(last_directory).c_str());
         }
         else
         {
-            chooser.directory(install_dir.c_str());
+            chooser.directory(SanitizePath(install_dir).c_str());
         }
 
         switch (chooser.show())

diff --git a/source/m_options.cc b/source/m_options.cc
@@ -580,7 +580,7 @@ class UI_OptionsWin : public Fl_Window
 
         chooser.title(_("Select default save directory"));
         chooser.type(Fl_Native_File_Chooser::BROWSE_DIRECTORY);
-        chooser.directory(BestDirectory().c_str());
+        chooser.directory(SanitizePath(BestDirectory()).c_str());
 
         int result = chooser.show();
 

diff --git a/source/m_theme.cc b/source/m_theme.cc
@@ -58,7 +58,7 @@ std::string Theme_OutputFilename()
     chooser.filter("Text files\t*.txt");
 
     std::string theme_dir = PathAppend(install_dir, "theme");
-    chooser.directory(theme_dir.c_str());
+    chooser.directory(SanitizePath(theme_dir).c_str());
 
     FL_NORMAL_SIZE = old_font_h;
 
@@ -102,7 +102,7 @@ std::string Theme_AskLoadFilename()
     chooser.filter("Text files\t*.txt");
 
     std::string theme_dir = PathAppend(install_dir, "theme");
-    chooser.directory(theme_dir.c_str());
+    chooser.directory(SanitizePath(theme_dir).c_str());
 
     int result = chooser.show();