From e60e30808746c9e1c49f33baecd839767303a0d9 Mon Sep 17 00:00:00 2001
From: Jamie Reece Wilson <me@reece.sx>
Date: Sat, 2 Dec 2023 18:14:14 +0000
Subject: [PATCH] [*] Minor WaitMultipleLoopSources optimization

---
 Source/IO/Loop/Loop.cpp | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/Source/IO/Loop/Loop.cpp b/Source/IO/Loop/Loop.cpp
index a14825f6..b266b78e 100644
--- a/Source/IO/Loop/Loop.cpp
+++ b/Source/IO/Loop/Loop.cpp
@@ -110,7 +110,8 @@ namespace Aurora::IO::Loop
             auto pSource = lsList[0];
             if (!pSource)
             {
-                return false;
+                signaled.push_back({});
+                return true;
             }
 
             bool bStatus {};
@@ -253,13 +254,20 @@ namespace Aurora::IO::Loop
             auto lsList2 = lsList;
             bool bAnyFound {};
 
-            auto DoTheThing = [&]()
+            auto DoTheThing = [&](bool bLastTick)
             {
                 for (auto itr = lsList2.begin();
                      itr != lsList2.end();
                      )
                 {
                     auto pSource = *itr;
+                    if (!pSource)
+                    {
+                        signalTemp.push_back({});
+                        itr = lsList2.erase(itr);
+                        continue;
+                    }
+
                     auto eType = pSource->GetType();
 
                     if (eType == ELoopSource::eSourceMutex ||
@@ -278,7 +286,14 @@ namespace Aurora::IO::Loop
                         }
                         else
                         {
-                            itr++;
+                            if (bLastTick && bZeroTick)
+                            {
+                                itr = lsList2.erase(itr);
+                            }
+                            else
+                            {
+                                itr++;
+                            }
                         }
                     }
                     else
@@ -293,19 +308,19 @@ namespace Aurora::IO::Loop
             {
                 AuThreadPrimitives::DoTryIf([&]()
                 {
-                    DoTheThing();
+                    DoTheThing(false);
                     return lsList2.size() != lsList.size() || 
                         !bAnyFound;
                 });
 
                 if (bAnyFound)
                 {
-                    DoTheThing();
+                    DoTheThing(true);
                 }
             }
             else
             {
-                DoTheThing();
+                DoTheThing(true);
             }
 
             if (lsList2.size())