From 1b0114dcb3d24ba70b46ee3d75ffb4b84d6c10ab Mon Sep 17 00:00:00 2001 From: Jacob Colyer Date: Mon, 15 Oct 2018 15:17:03 -0400 Subject: [PATCH] Fixes NullReferenceException in #1354 This issues a fix for the NullReferenceException that occurs in v3.4 of AvalonDock when the _draggingItem is null on MouseEnter (reference issue #1354). --- .../Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs index 743e0265..0d38e658 100644 --- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs +++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs @@ -181,7 +181,8 @@ namespace Xceed.Wpf.AvalonDock.Controls { base.OnMouseEnter( e ); - if( _draggingItem != this && + if( _draggingItem != null && + _draggingItem != this && e.LeftButton == MouseButtonState.Pressed ) { var model = Model;