mirror of
https://github.com/RPCS3/rpcs3.git
synced 2026-03-18 11:15:27 +01:00
overlays/home: Fix restarting games from home menu
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
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
This commit is contained in:
parent
5416f432b5
commit
6523afa69a
|
|
@ -135,7 +135,7 @@ namespace rsx
|
|||
{
|
||||
// Make sure we keep the game window opened
|
||||
Emu.SetContinuousMode(true);
|
||||
Emu.Restart(false);
|
||||
Emu.Restart(true);
|
||||
});
|
||||
return page_navigation::exit;
|
||||
});
|
||||
|
|
|
|||
|
|
@ -959,11 +959,6 @@ game_boot_result Emulator::BootGame(const std::string& path, const std::string&
|
|||
return result;
|
||||
};
|
||||
|
||||
if (m_path_original.empty() || config_mode != cfg_mode::continuous)
|
||||
{
|
||||
m_path_original = m_path;
|
||||
}
|
||||
|
||||
m_path_old = m_path;
|
||||
|
||||
m_config_mode = config_mode;
|
||||
|
|
@ -974,6 +969,11 @@ game_boot_result Emulator::BootGame(const std::string& path, const std::string&
|
|||
{
|
||||
m_path = path;
|
||||
|
||||
if (config_mode != cfg_mode::continuous || m_path_original.empty())
|
||||
{
|
||||
m_path_original = m_path;
|
||||
}
|
||||
|
||||
return restore_on_no_boot(Load(title_id));
|
||||
}
|
||||
|
||||
|
|
@ -984,6 +984,12 @@ game_boot_result Emulator::BootGame(const std::string& path, const std::string&
|
|||
{
|
||||
ensure(!elf.empty());
|
||||
m_path = elf;
|
||||
|
||||
if (config_mode != cfg_mode::continuous || m_path_original.empty())
|
||||
{
|
||||
m_path_original = m_path;
|
||||
}
|
||||
|
||||
result = Load(title_id);
|
||||
}
|
||||
|
||||
|
|
@ -4001,6 +4007,13 @@ game_boot_result Emulator::Restart(bool graceful)
|
|||
m_path = m_path_real;
|
||||
}
|
||||
|
||||
// If continuous mode changed the path, restart from the original executable
|
||||
if (!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;
|
||||
}
|
||||
|
||||
// Allow Boot (guarded by GracefulShutdown, which is the scope of this callback)
|
||||
m_restrict_emu_state_change = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -611,7 +611,7 @@ void load_iso(const std::string& path)
|
|||
|
||||
void unload_iso()
|
||||
{
|
||||
sys_log.notice("Unoading iso");
|
||||
sys_log.notice("Unloading iso");
|
||||
|
||||
fs::set_virtual_device("iso_overlay_fs_dev", stx::shared_ptr<iso_device>());
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue