Merge remote-tracking branch 'origin/master' into features/managed-notifications

8 years ago · 5317cb5b27
1 changed files with 4 additions and 1 deletions
--- a/src/Avalonia.Controls/Platform/InProcessDragSource.cs
+++ b/src/Avalonia.Controls/Platform/InProcessDragSource.cs
@ -147,7 +147,10 @@ namespace Avalonia.Platform
                e.Handled = true;
            }
            else if (e.Key == Key.LeftCtrl || e.Key == Key.RightCtrl || e.Key == Key.LeftAlt || e.Key == Key.RightAlt)
-                RaiseEventAndUpdateCursor(RawDragEventType.DragOver, _lastRoot, _lastPosition, e.Modifiers);
+            {
+                if (_lastRoot != null)
+                    RaiseEventAndUpdateCursor(RawDragEventType.DragOver, _lastRoot, _lastPosition, e.Modifiers);
+            }
        }

        private void ProcessMouseEvents(RawMouseEventArgs e)