Add early termination for gui_pad_thread

Author: elad335

rpcs3/Emu/System.cpp

@@ -3895,23 +3895,14 @@ bool Emulator::Quit(bool force_quit)
 
 void Emulator::CleanUp()
 {
-	// Signal threads
-	if (auto rsx = g_fxo->try_get<rsx::thread>())
-	{
-		*static_cast<cpu_thread*>(rsx) = thread_state::aborting;
-	}
-
-	for (const auto& [type, data] : *g_fxo)
+	// Join threads
+	qt_events_aware_op(50, [&]()
 	{
-		if (type.thread_op)
+		if (!g_fxo->is_init())
 		{
-			type.thread_op(data, thread_state::aborting);
+			return true;
 		}
-	}
 
-	// Join threads
-	qt_events_aware_op(50, [&]()
-	{
 		bool has_running = false;
 
 		for (const auto& [type, data] : *g_fxo)

rpcs3/Input/gui_pad_thread.cpp

@@ -45,8 +45,18 @@ gui_pad_thread::gui_pad_thread()
 	m_thread = std::make_unique<named_thread<std::function<void()>>>("Gui Pad Thread", [this](){ run(); });
 }
 
-gui_pad_thread::~gui_pad_thread()
+gui_pad_thread& gui_pad_thread::operator=(thread_state state) noexcept
 {
+	if (state == thread_state::aborting)
+	{
+		if (m_thread)
+		{
+			*m_thread = state;
+		}
+
+		return *this;
+	}
+
 	// Join thread
 	m_thread.reset();
 
@@ -63,6 +73,18 @@ gui_pad_thread::~gui_pad_thread()
 		m_uinput_fd = -1;
 	}
 #endif
+
+	return *this;
+}
+
+gui_pad_thread::operator thread_state() const noexcept
+{
+	return m_thread && *m_thread != thread_state::finished ? m_thread->operator thread_state() : thread_state::finished;
+}
+
+gui_pad_thread::~gui_pad_thread()
+{
+	*this = thread_state::finished;
 }
 
 void gui_pad_thread::update_settings(const std::shared_ptr<gui_settings>& settings)

rpcs3/Input/gui_pad_thread.h

@@ -15,6 +15,8 @@ class gui_pad_thread
 {
 public:
 	gui_pad_thread();
+	gui_pad_thread& operator=(thread_state state) noexcept;
+	operator thread_state() const noexcept;
 	virtual ~gui_pad_thread();
 
 	void update_settings(const std::shared_ptr<gui_settings>& settings);