Merge branch 'master' into master

This commit is contained in:
Megamouse 2025-12-01 17:51:59 +01:00 committed by GitHub
commit de5225fbb4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 1 deletions

View file

@ -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);

View file

@ -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);