[Windows] fix #1221

Siv3D · Apr 25, 2024 · db4b25a · db4b25a
1 parent 832fbe3
commit db4b25a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/Keyboard/CKeyboard.cpp b/Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/Keyboard/CKeyboard.cpp
@@ -214,6 +214,8 @@ namespace s3d
 
 	Array<KeyEvent> CKeyboard::getEvents() const noexcept
 	{
+		std::lock_guard lock{ m_eventMutex };
+
 		return m_events;
 	}
 

diff --git a/Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/Keyboard/CKeyboard.hpp b/Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/Keyboard/CKeyboard.hpp
@@ -62,7 +62,7 @@ namespace s3d
 
 		//////
 		//
-		std::mutex m_eventMutex;
+		mutable std::mutex m_eventMutex;
 
 		uint32 m_eventIndex = 0;
-Original file line number
+Diff line change
@@ Expand Up / @@ -214,6 +214,8 @@ namespace s3d @@
     	Array<KeyEvent> CKeyboard::getEvents() const noexcept
     	{
+    		std::lock_guard lock{ m_eventMutex };
     		return m_events;
     	}
@@ Expand Down @@