RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 02:32:36 +01:00
Code Issues Releases Wiki Activity

Savestates: Fixup file write

Browse Source
This commit is contained in:
Elad Ashkenazi 2024-05-05 04:37:49 +03:00
parent 0fcb0b7d8e
commit 91a54c11eb
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Utilities/File.cpp
View File

@ -2479,10 +2479,13 @@ bool fs::pending_file::commit(bool overwrite)
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
// Disable auto-delete if (file)
FILE_DISPOSITION_INFO disp; {
disp.DeleteFileW = false; // Disable auto-delete
SetFileInformationByHandle(file.get_handle(), FileDispositionInfo, &disp, sizeof(disp)); FILE_DISPOSITION_INFO disp;
disp.DeleteFileW = false;
ensure(SetFileInformationByHandle(file.get_handle(), FileDispositionInfo, &disp, sizeof(disp)));
}
#endif #endif
file.close(); file.close();

6
rpcs3/Emu/System.cpp
View File

@ -3345,13 +3345,13 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s
set_progress_message("Commiting File"); set_progress_message("Commiting File");
fs::file to_close_file;
{ {
auto& ar = *to_ar->load();
auto reset = init_mtx->reset(); auto reset = init_mtx->reset();
to_close_file = std::move(file.file); ar = {};
ar.set_reading_state(); // Guard against using it
reset.set_init(); reset.set_init();
} }
to_close_file.close();
if (!file.commit() || !fs::get_stat(path, file_stat)) if (!file.commit() || !fs::get_stat(path, file_stat))
{ {

2
rpcs3/rpcs3qt/gui_application.cpp
View File

@ -740,7 +740,7 @@ void gui_application::InitializeCallbacks()
verbose_message = "\n" + *str_ptr; verbose_message = "\n" + *str_ptr;
} }
bytes_written = std::max<usz>(ar_ptr->get_size(), old_written); bytes_written = ar_ptr->is_writing() ? std::max<usz>(ar_ptr->get_size(), old_written) : old_written;
break; break;
} }