这是indexloc提供的服务，不要输入任何密码
Skip to content

Fix: Potential NRE on app close #425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 24, 2023
Merged

Fix: Potential NRE on app close #425

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6396533
Merge pull request #1 from Dirkster99/master
Khaos66 Feb 9, 2023
d43c7c6
Fix: potential NRE on close
Khaos66 Feb 9, 2023
e30352f
Fix floating windows still created twice
Khaos66 Feb 9, 2023
324effd
Merge pull request #2 from Khaos66/Fix_426
Khaos66 Feb 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions source/Components/AvalonDock/DockingManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1138,7 +1138,7 @@ public double GridSplitterHeight
new FrameworkPropertyMetadata((Style)null));

/// <summary>
/// Gets or sets the GridSplitterVerticalStyle property. This dependency property
/// Gets or sets the GridSplitterVerticalStyle property. This dependency property
/// indicates the style to apply to the LayoutGridResizerControl when displayed vertically.
/// </summary>
public Style GridSplitterVerticalStyle
Expand All @@ -1164,7 +1164,7 @@ public Style GridSplitterVerticalStyle
new FrameworkPropertyMetadata((Style)null));

/// <summary>
/// Gets or sets the GridSplitterHorizontalStyle property. This dependency property
/// Gets or sets the GridSplitterHorizontalStyle property. This dependency property
/// indicates the style to apply to the LayoutGridResizerControl when displayed horizontally.
/// </summary>
public Style GridSplitterHorizontalStyle
Expand Down Expand Up @@ -2125,9 +2125,8 @@ private void DockingManager_Loaded(object sender, RoutedEventArgs e)
}
_fwHiddenList.Clear();

// load floating windows not already loaded! (issue #59 & #254)
var items = new List<LayoutFloatingWindow>(Layout.FloatingWindows.Where(fw => !_fwList.Any(fwc => fwc.Model == fw)));
foreach (var fw in items)
// load floating windows not already loaded! (issue #59 & #254 & #426)
foreach (var fw in Layout.FloatingWindows.Where(fw => !_fwList.Any(fwc => fwc.Model == fw)))
CreateUIElementForModel(fw);

//create the overlaywindow if it's possible
Expand Down Expand Up @@ -2292,7 +2291,7 @@ private void DocumentsSourceElementsChanged(object sender, NotifyCollectionChang
foreach (var documentToRemove in documentsToRemove)
{
documentToRemove.Content = null;
documentToRemove.Parent.RemoveChild(documentToRemove);
documentToRemove.Parent?.RemoveChild(documentToRemove);
RemoveViewFromLogicalChild(documentToRemove);
}
}
Expand Down Expand Up @@ -2354,7 +2353,7 @@ private void DocumentsSourceElementsChanged(object sender, NotifyCollectionChang
var documentsToRemove = GetItemsToRemoveAfterReset<LayoutDocument>(DocumentsSource);
foreach (var documentToRemove in documentsToRemove)
{
(documentToRemove.Parent as ILayoutContainer).RemoveChild(
(documentToRemove.Parent as ILayoutContainer)?.RemoveChild(
documentToRemove);
RemoveViewFromLogicalChild(documentToRemove);
}
Expand Down