Skip to content

Commit 29f3923

Browse files
authored
DYN-8805 Handle crash when hovering over incanvas search results while typing (#16177)
1 parent 3bd3a1a commit 29f3923

File tree

1 file changed

+18
-6
lines changed

1 file changed

+18
-6
lines changed

src/DynamoCoreWpf/Controls/IncanvasSearchControl.xaml.cs

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,16 +85,28 @@ private void OnMouseEnter(object sender, MouseEventArgs e)
8585
{
8686
if (!(sender is FrameworkElement fromSender)) return;
8787

88-
HighlightedItem.IsSelected = false;
89-
toolTipPopup.DataContext = fromSender.DataContext;
90-
toolTipPopup.IsOpen = true;
88+
if (HighlightedItem != null)
89+
{
90+
HighlightedItem.IsSelected = false;
91+
}
92+
if (toolTipPopup != null)
93+
{
94+
toolTipPopup.DataContext = fromSender.DataContext;
95+
toolTipPopup.IsOpen = true;
96+
}
9197
}
9298

9399
private void OnMouseLeave(object sender, MouseEventArgs e)
94100
{
95-
HighlightedItem.IsSelected = true;
96-
toolTipPopup.DataContext = null;
97-
toolTipPopup.IsOpen = false;
101+
if (HighlightedItem != null)
102+
{
103+
HighlightedItem.IsSelected = true;
104+
}
105+
if (toolTipPopup != null)
106+
{
107+
toolTipPopup.DataContext = null;
108+
toolTipPopup.IsOpen = false;
109+
}
98110
}
99111

100112
private void OnInCanvasSearchControlVisibilityChanged(object sender, DependencyPropertyChangedEventArgs e)

0 commit comments

Comments
 (0)