epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace Thread.CurrentThread.ManagedThreadId with Environment.CurrentManagedThreadId

Browse Source
This commit is contained in:
teinarss
2021-08-10 21:40:21 +02:00
committed by abcdefg30
parent 573a6cf645
commit fba4c5049c
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/ModData.cs
View File

@@ -124,7 +124,7 @@ namespace OpenRA
return (IReadOnlyDictionary<string, SequenceProvider>)(new ReadOnlyDictionary<string, SequenceProvider>(items)); return (IReadOnlyDictionary<string, SequenceProvider>)(new ReadOnlyDictionary<string, SequenceProvider>(items));
}); });
initialThreadId = System.Threading.Thread.CurrentThread.ManagedThreadId; initialThreadId = Environment.CurrentManagedThreadId;
} }
// HACK: Only update the loading screen if we're in the main thread. // HACK: Only update the loading screen if we're in the main thread.
@@ -135,7 +135,7 @@ namespace OpenRA
LoadScreen.Display(); LoadScreen.Display();
} }
internal bool IsOnMainThread => System.Threading.Thread.CurrentThread.ManagedThreadId == initialThreadId; internal bool IsOnMainThread => Environment.CurrentManagedThreadId == initialThreadId;
public void InitializeLoaders(IReadOnlyFileSystem fileSystem) public void InitializeLoaders(IReadOnlyFileSystem fileSystem)
{ {

5
OpenRA.Platforms.Default/ThreadAffine.cs
View File

@@ -10,7 +10,6 @@
#endregion #endregion
using System; using System;
using System.Threading;
namespace OpenRA.Platforms.Default namespace OpenRA.Platforms.Default
{ {
@@ -25,12 +24,12 @@ namespace OpenRA.Platforms.Default
protected void SetThreadAffinity() protected void SetThreadAffinity()
{ {
managedThreadId = Thread.CurrentThread.ManagedThreadId; managedThreadId = Environment.CurrentManagedThreadId;
} }
protected void VerifyThreadAffinity() 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."); throw new InvalidOperationException("Cross-thread operation not valid: This method must only be called from the thread that owns this object.");
} }
} }