From 378ce066cd85f457654953f7d44c8810da933285 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 6 May 2026 12:39:32 +0200
Subject: [PATCH] Fix error when drag&drop new actor on Windows in Editor

---
 Source/Engine/Platform/Windows/WindowsWindow.DragDrop.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/Engine/Platform/Windows/WindowsWindow.DragDrop.cpp b/Source/Engine/Platform/Windows/WindowsWindow.DragDrop.cpp
index 1aa5c903e..61d4afd31 100644
--- a/Source/Engine/Platform/Windows/WindowsWindow.DragDrop.cpp
+++ b/Source/Engine/Platform/Windows/WindowsWindow.DragDrop.cpp
@@ -13,13 +13,13 @@
 #include "Engine/Core/Log.h"
 #include "Engine/Platform/IGuiData.h"
 #include "Engine/Platform/Base/DragDropHelper.h"
+#include "Engine/Graphics/GPUDevice.h"
 #include "Engine/Input/Input.h"
 #include "Engine/Input/Mouse.h"
 #endif
 
 #include "Engine/Platform/Win32/IncludeWindowsHeaders.h"
 #include <propidl.h>
-
 #if USE_EDITOR
 #include <oleidl.h>
 #include <shellapi.h>
@@ -648,6 +648,7 @@ HRESULT Window::Drop(Windows::IDataObject* pDataObj, Windows::DWORD grfKeyState,
     ::ScreenToClient((HWND)_handle, &p);
     GuiDragDropData.Init((IDataObject*)pDataObj);
     DragDropEffect effect = DragDropEffect::None;
+    ScopeLock gpuLock(GPUDevice::Instance->Locker); // Avoid issues when DoDragDropJob is during frame painting
     OnDragDrop(&GuiDragDropData, Float2(static_cast<float>(p.x), static_cast<float>(p.y)), effect);
     *pdwEffect = dropEffect2OleEnum(effect);
     return S_OK;