From fba4c5049c9d417faa091c0b26b960e09dcd4c30 Mon Sep 17 00:00:00 2001 From: teinarss Date: Tue, 10 Aug 2021 21:40:21 +0200 Subject: [PATCH] Replace Thread.CurrentThread.ManagedThreadId with Environment.CurrentManagedThreadId --- OpenRA.Game/ModData.cs | 4 ++-- OpenRA.Platforms.Default/ThreadAffine.cs | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/OpenRA.Game/ModData.cs b/OpenRA.Game/ModData.cs index b1c350cbad..1c1e3ee290 100644 --- a/OpenRA.Game/ModData.cs +++ b/OpenRA.Game/ModData.cs @@ -124,7 +124,7 @@ namespace OpenRA return (IReadOnlyDictionary)(new ReadOnlyDictionary(items)); }); - initialThreadId = System.Threading.Thread.CurrentThread.ManagedThreadId; + initialThreadId = Environment.CurrentManagedThreadId; } // HACK: Only update the loading screen if we're in the main thread. @@ -135,7 +135,7 @@ namespace OpenRA LoadScreen.Display(); } - internal bool IsOnMainThread => System.Threading.Thread.CurrentThread.ManagedThreadId == initialThreadId; + internal bool IsOnMainThread => Environment.CurrentManagedThreadId == initialThreadId; public void InitializeLoaders(IReadOnlyFileSystem fileSystem) { diff --git a/OpenRA.Platforms.Default/ThreadAffine.cs b/OpenRA.Platforms.Default/ThreadAffine.cs index 04a027b000..c6f76b41c4 100644 --- a/OpenRA.Platforms.Default/ThreadAffine.cs +++ b/OpenRA.Platforms.Default/ThreadAffine.cs @@ -10,7 +10,6 @@ #endregion using System; -using System.Threading; namespace OpenRA.Platforms.Default { @@ -25,12 +24,12 @@ namespace OpenRA.Platforms.Default protected void SetThreadAffinity() { - managedThreadId = Thread.CurrentThread.ManagedThreadId; + managedThreadId = Environment.CurrentManagedThreadId; } protected void VerifyThreadAffinity() { - if (managedThreadId != Thread.CurrentThread.ManagedThreadId) + if (managedThreadId != Environment.CurrentManagedThreadId) throw new InvalidOperationException("Cross-thread operation not valid: This method must only be called from the thread that owns this object."); } }