archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 21:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Emu: Fixup

Browse source
This commit is contained in:
Elad 2024-11-27 19:19:54 +02:00
parent 9a2bcd2508
commit d63e643081
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/Cell/PPUModule.cpp
View file

@ -1098,7 +1098,7 @@ void init_ppu_functions(utils::serial* ar, bool full = false)
} }
} }
else else
ensure(g_fxo->init<ppu_function_manager>()); g_fxo->init<ppu_function_manager>();
if (full) if (full)
{ {

17
rpcs3/Emu/System.cpp
View file

@ -1007,12 +1007,12 @@ void Emulator::SetForceBoot(bool force_boot)
game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch, usz recursion_count) game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch, usz recursion_count)
{ {
if (m_restrict_emu_state_change) if (recursion_count == 0 && m_restrict_emu_state_change)
{ {
return game_boot_result::currently_restricted; return game_boot_result::currently_restricted;
} }
if (m_state != system_state::stopped) if (recursion_count == 0 && m_state != system_state::stopped)
{ {
return game_boot_result::still_running; return game_boot_result::still_running;
} }
@ -1020,20 +1020,25 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
struct cleanup_t struct cleanup_t
{ {
Emulator* _this; Emulator* _this;
bool cleanup = true; usz recursion_count;
~cleanup_t() noexcept ~cleanup_t() noexcept
{ {
if (recursion_count != 0)
{
return;
}
_this->m_state.compare_and_swap_test(system_state::loading, system_state::stopped); _this->m_state.compare_and_swap_test(system_state::loading, system_state::stopped);
if (cleanup && _this->IsStopped()) if (_this->IsStopped())
{ {
_this->Kill(false); _this->Kill(false);
} }
} }
} cleanup{this}; } cleanup{this, recursion_count};
ensure(m_state.compare_and_swap_test(system_state::stopped, system_state::loading)); ensure(recursion_count != 0 || m_state.compare_and_swap_test(system_state::stopped, system_state::loading));
const auto guard = MakeEmulationStateGuard(); const auto guard = MakeEmulationStateGuard();