archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-08 16:01:42 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed_typemap.hpp: add range iterator

Browse source 
Remove recently added functions.
This commit is contained in:
Nekotekina 2021-06-08 23:12:40 +03:00
parent 4f76211551
commit 2d3fe7ce1c
3 changed files with 53 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

16
rpcs3/Emu/System.cpp
View file

@ -1542,31 +1542,23 @@ void Emulator::Stop(bool restart)
cpu_thread::stop_all();
using fxo_t = std::remove_pointer_t<decltype(g_fxo)>;
// Signal threads
for (const auto& type : fxo_t::view_typelist())
for (const auto& [type, data] : *g_fxo)
{
if (type.stop)
{
if (auto data = g_fxo->try_get(type))
{
type.stop(data, thread_state::aborting);
}
type.stop(data, thread_state::aborting);
}
}
GetCallbacks().on_stop();
// Join threads
for (const auto& type : fxo_t::view_typelist())
for (const auto& [type, data] : *g_fxo)
{
if (type.stop)
{
if (auto data = g_fxo->try_get(type))
{
type.stop(data, thread_state::finished);
}
type.stop(data, thread_state::finished);
}
}