Merge pull request #6014 from smoogipoo/fix-threadedtaskscheduler-rac…

…e-condition

Fix race condition in ThreadedTaskScheduler when adding tasks

osu.Framework.Tests/Threading/ThreadedTaskSchedulerTest.cs

@@ -83,5 +83,34 @@ public void EnsureScheduledTaskReturnsOnDisposal()
             Assert.That(run.Wait(30000));
             Assert.That(exited.Wait(30000));
         }
+
+        [Test]
+        [Repeat(1000)]
+        public void QueueAndDisposeStressTest()
+        {
+            ThreadedTaskScheduler scheduler = new ThreadedTaskScheduler(1, string.Empty);
+
+            Thread disposeThread = new Thread(() =>
+            {
+                scheduler.Dispose();
+            })
+            {
+                IsBackground = true
+            };
+
+            Thread queueThread = new Thread(() =>
+            {
+                Task.Factory.StartNew(() => { }, CancellationToken.None, TaskCreationOptions.HideScheduler, scheduler);
+            })
+            {
+                IsBackground = true
+            };
+
+            disposeThread.Start();
+            queueThread.Start();
+
+            disposeThread.Join();
+            queueThread.Join();
+        }
     }
 }

osu.Framework/Threading/ThreadedTaskScheduler.cs

@@ -87,7 +87,7 @@ protected override void QueueTask(Task task)
             {
                 tasks.Add(task);
             }
-            catch (ObjectDisposedException)
+            catch (Exception ex) when (ex is InvalidOperationException or ObjectDisposedException)
             {
                 // tasks may have been disposed. there's no easy way to check on this other than catch for it.
                 Logger.Log($"Task was queued for execution on a {nameof(ThreadedTaskScheduler)} ({name}) after it was disposed. The task will be executed inline.");