Fix Cursor Display Incorrectly On Drag (dotnet#11853)

Re-add condition to check drag image
omelentyev · Aug 10, 2024 · 3983d44 · 3983d44
1 parent d7c8152
commit 3983d44
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/OLE/DropSource.cs b/src/System.Windows.Forms/src/System/Windows/Forms/OLE/DropSource.cs
@@ -68,7 +68,7 @@ public HRESULT GiveFeedback(DROPEFFECT dwEffect)
 
         _peer.OnGiveFeedback(gfbEvent);
 
-        if (IsDropTargetWindowInCurrentThread() && !gfbEvent.Equals(_lastGiveFeedbackEventArgs))
+        if (IsDropTargetWindowInCurrentThread() && gfbEvent.DragImage is not null && !gfbEvent.Equals(_lastGiveFeedbackEventArgs))
         {
             _lastGiveFeedbackEventArgs = gfbEvent.Clone();
             UpdateDragImage(_lastGiveFeedbackEventArgs, _dataObject, _lastHwndTarget);
@@ -106,7 +106,7 @@ public unsafe HRESULT DragEnterTarget(HWND hwndTarget)
 
     public HRESULT DragLeaveTarget()
     {
-        if (IsDropTargetWindowInCurrentThread())
+        if (IsDropTargetWindowInCurrentThread() && _lastGiveFeedbackEventArgs?.DragImage is not null)
         {
             DragDropHelper.DragLeave();
         }