Skip to content

Commit 8efc344

Browse files
authored
WinUI Viewer: Fix NRE due to unexpected null SelectedSample (#1483)
1 parent 39005ea commit 8efc344

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/WinUI/ArcGIS.WinUI.Viewer/MainPage.xaml.cs

+3
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ await DataManager.EnsureSampleDataPresent(selectedSample, cancellationSource.Tok
160160
{
161161
// Failed to create new instance of the sample.
162162
SamplePageContainer.Visibility = Visibility.Collapsed;
163+
SampleManager.Current.SelectedSample = null;
163164
SampleSelectionGrid.Visibility = Visibility.Visible;
164165
CategoriesTree.SelectionMode = TreeViewSelectionMode.None;
165166
await new MessageDialog2(exception.Message).ShowAsync();
@@ -219,6 +220,7 @@ private async void OnSearchQuerySubmitted(AutoSuggestBox searchBox, AutoSuggestB
219220
// Switch to the sample selection grid.
220221
SamplePageContainer.Visibility = Visibility.Collapsed;
221222
SamplePageContainer.Content = null;
223+
SampleManager.Current.SelectedSample = null;
222224
SampleSelectionGrid.Visibility = Visibility.Visible;
223225
}
224226

@@ -235,6 +237,7 @@ private async void CategoriesTree_ItemInvoked(TreeView sender, TreeViewItemInvok
235237
{
236238
SamplePageContainer.Visibility = Visibility.Collapsed;
237239
SamplePageContainer.Content = null;
240+
SampleManager.Current.SelectedSample = null;
238241
SampleSelectionGrid.Visibility = Visibility.Visible;
239242
List<SampleInfo> samples = selected.Children.ToList().Select(x => (SampleInfo)x.Content).ToList();
240243
SamplesGridView.ItemsSource = samples;

src/WinUI/ArcGIS.WinUI.Viewer/SamplePage.xaml.cs

-2
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ private void SamplePage_Unloaded(object sender, RoutedEventArgs e)
101101
}
102102
else if (geoView is SceneView sceneView) sceneView.Scene = null;
103103
}
104-
105-
SampleManager.Current.SelectedSample = null;
106104
}
107105

108106
private static IEnumerable<T> TreeWalker<T>(UIElement root)

0 commit comments

Comments
 (0)