AvalonDock Fixed some null reference exceptions #1170

https://github.com/xceedsoftware/wpftoolkit/pull/1170/files xceedsoftware/wpftoolkit#1138
Dirkster99 · Nov 14, 2018 · d6e8ef9 · d6e8ef9
1 parent ce27dd0
commit d6e8ef9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 17 deletions.
diff --git a/source/Components/Xceed.Wpf.AvalonDock/AssemblyVersionInfo.cs b/source/Components/Xceed.Wpf.AvalonDock/AssemblyVersionInfo.cs
@@ -24,7 +24,7 @@ internal static class _XceedVersionInfo
   public const string BaseVersion = "3.4";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
   public const string Version = BaseVersion + 
-".0.7";
+".0.8";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
   public const string PublicKeyToken = "ba83ff368b7563c6";
 

diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs
@@ -68,11 +68,11 @@ public ILayoutElement Model
 
     protected override void OnGotKeyboardFocus( System.Windows.Input.KeyboardFocusChangedEventArgs e )
     {
-      if( ( _model != null ) && ( _model.SelectedContent != null ) )
+      if (_model?.SelectedContent != null)
       {
-        _model.SelectedContent.IsActive = true;
+          _model.SelectedContent.IsActive = true;
       }
-
+      
       base.OnGotKeyboardFocus( e );
     }
 

diff --git a/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs b/source/Components/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs
@@ -89,20 +89,14 @@ public ContentPresenter View
     {
       get
       {
-        if( _view == null )
+        if (_view == null)
         {
-          _view = new ContentPresenter();
-
-          _view.SetBinding( ContentPresenter.ContentProperty, new Binding( "Content" ) { Source = LayoutElement } );
-          if( ( LayoutElement != null ) && ( LayoutElement.Root != null ) )
-          {
-            _view.SetBinding( ContentPresenter.ContentTemplateProperty, new Binding( "LayoutItemTemplate" ) { Source = LayoutElement.Root.Manager } );
-            _view.SetBinding( ContentPresenter.ContentTemplateSelectorProperty, new Binding( "LayoutItemTemplateSelector" ) { Source = LayoutElement.Root.Manager } );
-            if( LayoutElement.Root.Manager != null )
-            {
-              LayoutElement.Root.Manager.InternalAddLogicalChild( _view );
-            }
-          }
+            _view = new ContentPresenter();
+
+            _view.SetBinding(ContentPresenter.ContentProperty, new Binding("Content") { Source = LayoutElement });
+            _view.SetBinding(ContentPresenter.ContentTemplateProperty, new Binding("LayoutItemTemplate") { Source = LayoutElement?.Root?.Manager });
+            _view.SetBinding(ContentPresenter.ContentTemplateSelectorProperty, new Binding("LayoutItemTemplateSelector") { Source = LayoutElement?.Root?.Manager });
+            LayoutElement?.Root?.Manager.InternalAddLogicalChild(_view);
         }
 
         return _view;