Merge pull request #8750 from leoetlino/close-before-rename

IOS/FS: Fix FST write failure on some platforms

1 files changed, 11 insertions, 3 deletions

diff --git a/Source/Core/Core/IOS/FS/HostBackend/FS.cpp b/Source/Core/Core/IOS/FS/HostBackend/FS.cpp
index fea5d16261..8859be7474 100644
--- a/Source/Core/Core/IOS/FS/HostBackend/FS.cpp
+++ b/Source/Core/Core/IOS/FS/HostBackend/FS.cpp
@@ -177,9 +177,17 @@ void HostFileSystem::SaveFst()
 
   const std::string dest_path = GetFstFilePath();
   const std::string temp_path = File::GetTempFilenameForAtomicWrite(dest_path);
-  File::IOFile file{temp_path, "wb"};
-  if (!file.WriteArray(to_write.data(), to_write.size()) || !File::Rename(temp_path, dest_path))
-    ERROR_LOG(IOS_FS, "Failed to write new FST");
+  {
+    // This temporary file must be closed before it can be renamed.
+    File::IOFile file{temp_path, "wb"};
+    if (!file.WriteArray(to_write.data(), to_write.size()))
+    {
+      PanicAlert("IOS_FS: Failed to write new FST");
+      return;
+    }
+  }
+  if (!File::Rename(temp_path, dest_path))
+    PanicAlert("IOS_FS: Failed to rename temporary FST file");
 }
 
 HostFileSystem::FstEntry* HostFileSystem::GetFstEntryForPath(const std::string& path)