RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-04-06 06:55:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

SaveStates: Fix restart after saving
Some checks are pending
Generate Translation Template / Generate Translation Template (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (/rpcs3/.ci/build-linux-aarch64.sh, gcc, rpcs3/rpcs3-ci-jammy-aarch64:1.9, ubuntu-24.04-arm) (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (/rpcs3/.ci/build-linux.sh, gcc, rpcs3/rpcs3-ci-jammy:1.9, ubuntu-24.04) (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1, rpcs3/rpcs3-binaries-linux-arm64, /rpcs3/.ci/build-linux-aarch64.sh, clang, rpcs3/rpcs3-ci-jammy-aarch64:1.9, ubuntu-24.04-arm) (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (d812f1254a1157c80fd402f94446310560f54e5f, rpcs3/rpcs3-binaries-linux, /rpcs3/.ci/build-linux.sh, clang, rpcs3/rpcs3-ci-jammy:1.9, ubuntu-24.04) (push) Waiting to run
Build RPCS3 / RPCS3 Mac ${{ matrix.name }} (0, 51ae32f468089a8169aaf1567de355ff4a3e0842, rpcs3/rpcs3-binaries-mac, Intel) (push) Waiting to run
Build RPCS3 / RPCS3 Mac ${{ matrix.name }} (1, 8e21bdbc40711a3fccd18fbf17b742348b0f4281, rpcs3/rpcs3-binaries-mac-arm64, Apple Silicon) (push) Waiting to run
Build RPCS3 / RPCS3 Windows (push) Waiting to run
Build RPCS3 / RPCS3 Windows Clang ${{ matrix.arch }} (aarch64, clang, clangarm64, ARM64, windows-11-arm) (push) Waiting to run
Build RPCS3 / RPCS3 Windows Clang ${{ matrix.arch }} (x86_64, clang, clang64, X64, windows-2025) (push) Waiting to run
Build RPCS3 / RPCS3 FreeBSD (push) Waiting to run

Browse source
This commit is contained in:
Elad 2026-03-27 21:39:33 +03:00
parent a4523651c7
commit 976cd1ce66
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_savestate.cpp
View file

@ -26,7 +26,7 @@ namespace rsx
{
if (!suspend_mode)
{
Emu.after_kill_callback = []() { Emu.Restart(); };
Emu.after_kill_callback = []() { Emu.Restart(true, false); };
// Make sure we keep the game window opened
Emu.SetContinuousMode(true);

6
rpcs3/Emu/System.cpp
View file

@ -3996,7 +3996,7 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s
}));
}
game_boot_result Emulator::Restart(bool graceful)
game_boot_result Emulator::Restart(bool graceful, bool reset_path)
{
if (m_state == system_state::stopping)
{
@ -4004,7 +4004,7 @@ game_boot_result Emulator::Restart(bool graceful)
return game_boot_result::still_running;
}
Emu.after_kill_callback = [this]
Emu.after_kill_callback = [this, reset_path]
{
// Reset boot path in case of ISO
if (m_path.starts_with(iso_device::virtual_device_name))
@ -4016,7 +4016,7 @@ game_boot_result Emulator::Restart(bool graceful)
}
// If continuous mode changed the path, restart from the original executable
if (!m_path_original.empty() && m_path_original != m_path)
if (reset_path && !m_path_original.empty() && m_path_original != m_path)
{
sys_log.notice("Restart: Resetting boot path from '%s' to original '%s'", m_path, m_path_original);
m_path = m_path_original;

2
rpcs3/Emu/System.h
View file

@ -442,7 +442,7 @@ public:
void Resume();
void GracefulShutdown(bool allow_autoexit = true, bool async_op = false, bool savestate = false, bool continuous_mode = false);
void Kill(bool allow_autoexit = true, bool savestate = false, savestate_stage* stage = nullptr);
game_boot_result Restart(bool graceful = true);
game_boot_result Restart(bool graceful = true, bool reset_path = true);
bool Quit(bool force_quit);
static void CleanUp();

2
rpcs3/rpcs3qt/gs_frame.cpp
View file

@ -362,7 +362,7 @@ void gs_frame::handle_shortcut(gui::shortcuts::shortcut shortcut_key, const QKey
{
Emu.after_kill_callback = []()
{
Emu.Restart();
Emu.Restart(true, false);
};
// Make sure we keep the game window opened

2
rpcs3/rpcs3qt/main_window.cpp
View file

@ -2538,7 +2538,7 @@ void main_window::CreateConnects()
{
Emu.after_kill_callback = []()
{
Emu.Restart();
Emu.Restart(true, false);
};
// Make sure we keep the game window opened