Merge pull request #328 from bbuerger/patch-1

NullCheck for currentActiveContent
Dirkster99 · Feb 12, 2022 · 2cb7c83 · 2cb7c83
2 parents 01ebaca + 84a52b8
commit 2cb7c83
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/source/Components/AvalonDock/Controls/DropTarget.cs b/source/Components/AvalonDock/Controls/DropTarget.cs
@@ -126,7 +126,8 @@ public void Drop(LayoutFloatingWindow floatingWindow)
 				var fwAsDocument = floatingWindow as LayoutDocumentFloatingWindow;
 				this.Drop(fwAsDocument);
 			}
-
+			if (currentActiveContent == null)
+				return;
 			Dispatcher.BeginInvoke(new Action(() =>
 				{
 					currentActiveContent.IsSelected = false;
@@ -154,4 +155,4 @@ public void DragLeave()
 
 		#endregion Public Methods
 	}
-}
+}