mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-12-06 07:12:28 +01:00
Merge branch 'master' into master
This commit is contained in:
commit
de5225fbb4
|
|
@ -3073,7 +3073,7 @@ namespace rsx
|
||||||
{
|
{
|
||||||
capture_current_frame = false;
|
capture_current_frame = false;
|
||||||
|
|
||||||
std::string file_path = fs::get_config_dir() + "captures/" + Emu.GetTitleID() + "_" + date_time::current_time_narrow() + "_capture.rrc.gz";
|
const std::string file_path = fs::get_config_dir() + "captures/" + (Emu.GetTitleID().empty() ? Emu.GetTitle() : Emu.GetTitleID()) + "_" + date_time::current_time_narrow() + "_capture.rrc.gz";
|
||||||
|
|
||||||
fs::pending_file temp(file_path);
|
fs::pending_file temp(file_path);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -840,6 +840,19 @@ bool Emulator::BootRsxCapture(const std::string& path)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m_path.clear();
|
||||||
|
m_path_old.clear();
|
||||||
|
m_path_original.clear();
|
||||||
|
m_title_id.clear();
|
||||||
|
m_title.clear();
|
||||||
|
m_localized_title.clear();
|
||||||
|
m_app_version.clear();
|
||||||
|
m_hash.clear();
|
||||||
|
m_cat.clear();
|
||||||
|
m_dir.clear();
|
||||||
|
m_sfo_dir.clear();
|
||||||
|
m_ar.reset();
|
||||||
|
|
||||||
Init();
|
Init();
|
||||||
g_cfg.video.disable_on_disk_shader_cache.set(true);
|
g_cfg.video.disable_on_disk_shader_cache.set(true);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue