fix potential sort order bug #40

hecomi · Oct 16, 2021 · 360fd96 · 360fd96
1 parent 268882a
commit 360fd96
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 1 deletion.
diff --git a/Assets/uWindowCapture/Plugins/x86/uWindowCapture.dll b/Assets/uWindowCapture/Plugins/x86/uWindowCapture.dll
diff --git a/Assets/uWindowCapture/Plugins/x86_64/uWindowCapture.dll b/Assets/uWindowCapture/Plugins/x86_64/uWindowCapture.dll
diff --git a/Assets/uWindowCapture/Scripts/UwcLib.cs b/Assets/uWindowCapture/Scripts/UwcLib.cs
@@ -92,6 +92,8 @@ public static class Lib
     private static extern IntPtr GetMessages_Internal();
     [DllImport(name, EntryPoint = "UwcClearMessages")]
     private static extern void ClearMessages();
+    [DllImport(name, EntryPoint = "UwcExcludeRemovedWindowEvents")]
+    private static extern void ExcludeRemovedWindowEvents();
     [DllImport(name, EntryPoint = "UwcCheckWindowExistence")]
     public static extern bool CheckWindowExistence(int id);
     [DllImport(name, EntryPoint = "UwcGetWindowHandle")]
@@ -229,6 +231,8 @@ public static class Lib
 
     public static Message[] GetMessages()
     {
+        ExcludeRemovedWindowEvents();
+
         var count = GetMessageCount();
         var messages = new Message[count];
 

diff --git a/Plugins/uWindowCapture/uWindowCapture/Main.cpp b/Plugins/uWindowCapture/uWindowCapture/Main.cpp
@@ -138,6 +138,12 @@ extern "C"
         return MessageManager::Get().GetHeadPointer();
     }
 
+    UNITY_INTERFACE_EXPORT void UNITY_INTERFACE_API UwcExcludeRemovedWindowEvents()
+    {
+        if (MessageManager::IsNull()) return;
+        MessageManager::Get().ExcludeRemovedWindowEvents();
+    }
+
     UNITY_INTERFACE_EXPORT void UNITY_INTERFACE_API UwcClearMessages()
     {
         if (MessageManager::IsNull()) return;

diff --git a/Plugins/uWindowCapture/uWindowCapture/Message.cpp b/Plugins/uWindowCapture/uWindowCapture/Message.cpp
@@ -1,3 +1,4 @@
+#include <set>
 #include "Message.h"
 
 
@@ -31,4 +32,31 @@ void MessageManager::ClearAll()
 {
     std::lock_guard<std::mutex> lock(mutex_);
     messages_.clear();
-}
+}
+
+
+void MessageManager::ExcludeRemovedWindowEvents()
+{
+    std::lock_guard<std::mutex> lock(mutex_);
+
+    std::set<int> removedWinedowIds; 
+    for (const auto& message : messages_)
+    {
+        if (message.type == MessageType::WindowRemoved)
+        {
+            removedWinedowIds.insert(message.windowId);
+        }
+    }
+
+    for (auto it = messages_.begin(); it != messages_.end();)
+    {
+        const auto& message = *it;
+        if (removedWinedowIds.find(message.windowId) != removedWinedowIds.end() && 
+            message.type != MessageType::WindowRemoved)
+        {
+            it = messages_.erase(it);
+            continue;
+        }
+        ++it;
+    }
+}
diff --git a/Plugins/uWindowCapture/uWindowCapture/Message.h b/Plugins/uWindowCapture/uWindowCapture/Message.h
@@ -40,6 +40,7 @@ class MessageManager
 public:
     void Add(Message message);
     void ClearAll();
+    void ExcludeRemovedWindowEvents();
     UINT GetCount() const;
     const Message* GetHeadPointer() const;