Merge pull request #1015 from UselessToucan/lockThis

Do not use 'this' object for locking
ppy · Sep 3, 2017 · 4a0637a · 4a0637a
2 parents 2bd341b + ec0fe91
commit 4a0637a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/osu.Framework/Graphics/Textures/TextureAtlas.cs b/osu.Framework/Graphics/Textures/TextureAtlas.cs
@@ -30,6 +30,7 @@ public class TextureAtlas
 
         private readonly bool manualMipmaps;
         private readonly All filteringMode;
+        private readonly object textureRetrievalLock = new object();
 
         public TextureAtlas(int width, int height, bool manualMipmaps = false, All filteringMode = All.Linear)
         {
@@ -94,7 +95,7 @@ private Vector2I findPosition(int width, int height)
 
         internal Texture Add(int width, int height)
         {
-            lock (this)
+            lock (textureRetrievalLock)
             {
                 if (atlasTexture == null)
                     Reset();

diff --git a/osu.Framework/Input/Handlers/InputHandler.cs b/osu.Framework/Input/Handlers/InputHandler.cs
@@ -19,12 +19,14 @@ public abstract class InputHandler : IDisposable
 
         protected ConcurrentQueue<InputState> PendingStates = new ConcurrentQueue<InputState>();
 
+        private readonly object pendingStatesRetrievalLock = new object();
+
         /// <summary>
         /// Retrieve a list of all pending states since the last call to this method.
         /// </summary>
         public virtual List<InputState> GetPendingStates()
         {
-            lock (this)
+            lock (pendingStatesRetrievalLock)
             {
                 List<InputState> pending = new List<InputState>();