Better handling of opendir/readdir and savefiles

Author: clementgallet

CHANGELOG.md

@@ -9,6 +9,7 @@
 
 * Savestates now restore better file descriptors
 * Fix SDL getting window dimensions of zero
+* Better handling of opendir/readdir and savefiles
 
 ## [1.4.7] - 2025-10-06
 ### Added

src/library/fileio/FileHandleList.cpp

@@ -108,6 +108,8 @@ void updateAllFiles()
 {
     PROFILE_SCOPE("File Handles", PROFILER_INFO_FRAME);
 
+    GlobalNative gn;
+
     auto& filehandles = getFileList();
     filehandles.clear();
 

src/library/fileio/SaveFileList.cpp

@@ -330,7 +330,7 @@ bool isSaveFileRemoved(const char *file)
     return false;
 }
 
-std::string getSaveFileInsideDir(std::string dir, int n)
+const SaveFile* getSaveFileInsideDir(std::string dir, int n)
 {
     std::lock_guard<std::mutex> lock(getSaveFileListMutex());
 
@@ -349,12 +349,12 @@ std::string getSaveFileInsideDir(std::string dir, int n)
 
         /* Skip based on index */
         if (index == n)
-            return relfile;
+            return savefile.get();
 
         index++;
     }
 
-    return "";
+    return nullptr;
 }
 
 }

src/library/fileio/SaveFileList.h

@@ -72,8 +72,8 @@ int getSaveFileFd(const char *file);
 /* Get if savefile was removed */
 bool isSaveFileRemoved(const char *file);
 
-/* Get the n-th save file inside directory `dir`. Returns empty string if not present */
-std::string getSaveFileInsideDir(std::string dir, int n);
+/* Get the n-th save file inside directory `dir`. Returns nullptr if not present */
+const SaveFile* getSaveFileInsideDir(std::string dir, int n);
 
 }