RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 10:42:36 +01:00
Code Issues Releases Wiki Activity

Cleanup Emu before the update reboot

Browse Source
This commit is contained in:
Megamouse 2021-03-06 21:10:35 +01:00 committed by Ivan
parent 9da7910fc9
commit dab53f4e41
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rpcs3/Emu/System.cpp
View File

@ -1977,12 +1977,17 @@ bool Emulator::Quit(bool force_quit)
// The callback is only used if we actually quit RPCS3
const auto on_exit = []()
{
// Deinitialize object manager to prevent any hanging objects at program exit
g_fxo->clear();
Emu.CleanUp();
};
return GetCallbacks().try_to_quit(force_quit, on_exit);
}
void Emulator::CleanUp()
{
// Deinitialize object manager to prevent any hanging objects at program exit
g_fxo->clear();
}
std::string Emulator::GetFormattedTitle(double fps) const
{
rpcs3::title_format_data title_data;

1
rpcs3/Emu/System.h
View File

@ -236,6 +236,7 @@ public:
void Stop(bool restart = false);
void Restart() { Stop(true); }
bool Quit(bool force_quit);
void CleanUp();
bool IsRunning() const { return m_state == system_state::running; }
bool IsPaused() const { return m_state == system_state::paused; }

4
rpcs3/rpcs3qt/update_manager.cpp
View File

@ -545,6 +545,10 @@ bool update_manager::handle_rpcs3(const QByteArray& data)
QMessageBox::information(m_parent, tr("Auto-updater"), tr("Update successful!\nRPCS3 will now restart."));
Emu.SetForceBoot(true);
Emu.Stop();
Emu.CleanUp();
#ifdef _WIN32
const int ret = _wexecl(wchar_orig_path.data(), L"--updating", nullptr);
#else