mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-29 22:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

rsx/overlays: Fix emu close

Browse Source
This commit is contained in:
kd-11 2023-02-26 01:53:28 +03:00 committed by kd-11
parent 3ff464641a
commit 1e0565f17b
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rpcs3/Emu/RSX/Overlays/overlay_manager.cpp
View File

@ -20,8 +20,21 @@ namespace rsx
{ {
if (m_input_thread) if (m_input_thread)
{ {
// This keeps the input thread from looping again
m_input_thread_abort.store(true); m_input_thread_abort.store(true);
// Wake it if it is asleep
const input_thread_context_t wakeup_node =
{
"stop_node",
nullptr,
nullptr,
nullptr,
nullptr
};
m_input_token_stack.push(wakeup_node);
// Wait for join
*m_input_thread = thread_state::aborting; *m_input_thread = thread_state::aborting;
while (*m_input_thread <= thread_state::aborting) while (*m_input_thread <= thread_state::aborting)
{ {
@ -87,7 +100,8 @@ namespace rsx
{ {
return std::find(uids.begin(), uids.end(), e->uid) != uids.end(); return std::find(uids.begin(), uids.end(), e->uid) != uids.end();
}), }),
m_dirty_list.end()); m_dirty_list.end()
);
} }
bool display_manager::remove_type(u32 type_id) bool display_manager::remove_type(u32 type_id)
@ -197,7 +211,7 @@ namespace rsx
for (auto&& input_context : m_input_token_stack.pop_all_reversed()) for (auto&& input_context : m_input_token_stack.pop_all_reversed())
{ {
if (input_context.target->is_detached()) if (!input_context.target || input_context.target->is_detached())
{ {
continue; continue;
} }