Fix: Quick ingame scene & map changes causing event data from previou…

…s map to be incorrectly reused
Piotrekol · Nov 4, 2022 · 8bc9417 · 8bc9417
1 parent 8651e2b
commit 8bc9417
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/osu!StreamCompanion/Code/Core/Maps/Processing/OsuEventHandler.cs b/osu!StreamCompanion/Code/Core/Maps/Processing/OsuEventHandler.cs
@@ -71,8 +71,13 @@ private void NewOsuEvent(object sender, IMapSearchArgs mapSearchArgs)
                 LegacyOsuTasks.Push(mapSearchArgs);
                 return;
             }
+
+            //Cancel current event only if we're changing map - otherwise we'll be reusing most of that data anyway
+            if (mapSearchArgs.EventType == OsuEventType.MapChange)
+            {
+                _cancellationTokenSource.TryCancel();
+            }
 
-            _cancellationTokenSource.TryCancel();
             OsuTasks.Clear();
             _logger.SetContextData("Osu_event", eventData);