1 files changed, 10 insertions, 7 deletions

diff --git a/Ryujinx.Core/OsHle/Objects/Android/NvFlinger.cs b/Ryujinx.Core/OsHle/Objects/Android/NvFlinger.cs
index 54588383..11069cb2 100644
--- a/Ryujinx.Core/OsHle/Objects/Android/NvFlinger.cs
+++ b/Ryujinx.Core/OsHle/Objects/Android/NvFlinger.cs
@@ -291,7 +291,10 @@ namespace Ryujinx.Core.OsHle.Objects.Android
 
                 BufferQueue[Slot].State = BufferState.Free;
 
-                WaitBufferFree.Set();
+                lock (WaitBufferFree)
+                {
+                    WaitBufferFree.Set();
+                }
             });
         }
 
@@ -317,15 +320,15 @@ namespace Ryujinx.Core.OsHle.Objects.Android
 
             do
             {
-                if ((Slot = GetFreeSlot(Width, Height)) != -1)
+                lock (WaitBufferFree)
                 {
-                    break;
-                }
+                    if ((Slot = GetFreeSlot(Width, Height)) != -1)
+                    {
+                        break;
+                    }
 
-                Logging.Debug("Waiting for a free BufferQueue slot...");
+                    Logging.Debug("Waiting for a free BufferQueue slot...");
 
-                lock (WaitBufferFree)
-                {
                     if (!KeepRunning)
                     {
                         break;