From 0a39163a90de377843d4726154a0247caa928fa1 Mon Sep 17 00:00:00 2001
From: Rodrigo Locatti <rodrigo.locatti@gmail.com>
Date: Tue, 22 Jun 2021 02:31:39 -0300
Subject: input_common/mouse_input: Fix data race

Fix data race using std::jthread and std::stop_token.
---
 src/input_common/mouse/mouse_input.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/input_common/mouse/mouse_input.h')

diff --git a/src/input_common/mouse/mouse_input.h b/src/input_common/mouse/mouse_input.h
index 5a971ad67..c8bae99c1 100644
--- a/src/input_common/mouse/mouse_input.h
+++ b/src/input_common/mouse/mouse_input.h
@@ -6,6 +6,7 @@
 
 #include <array>
 #include <mutex>
+#include <stop_token>
 #include <thread>
 
 #include "common/common_types.h"
@@ -85,7 +86,7 @@ public:
     [[nodiscard]] const MouseData& GetMouseState(std::size_t button) const;
 
 private:
-    void UpdateThread();
+    void UpdateThread(std::stop_token stop_token);
     void UpdateYuzuSettings();
     void StopPanning();
 
@@ -105,12 +106,11 @@ private:
     u16 buttons{};
     u16 toggle_buttons{};
     u16 lock_buttons{};
-    std::thread update_thread;
+    std::jthread update_thread;
     MouseButton last_button{MouseButton::Undefined};
     std::array<MouseInfo, 7> mouse_info;
     Common::SPSCQueue<MouseStatus> mouse_queue;
     bool configuring{false};
-    bool update_thread_running{true};
     int mouse_panning_timout{};
 };
 } // namespace MouseInput
-- 
cgit v1.2.3