diff --git a/src/WPF/WPF.Viewer/Samples/Map/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.xaml.cs b/src/WPF/WPF.Viewer/Samples/Map/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.xaml.cs index 78db2c31c8..0a95481ffd 100644 --- a/src/WPF/WPF.Viewer/Samples/Map/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.xaml.cs +++ b/src/WPF/WPF.Viewer/Samples/Map/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.xaml.cs @@ -62,6 +62,9 @@ private void BasemapStyleGallery_SelectionChanged(object sender, SelectionChange private void LoadButton_Click(object sender, RoutedEventArgs e) { + // Return if no basemap style is selected. + if (BasemapStyleGallery.SelectedItem == null) return; + // Create a new basemap style parameters object. var basemapStyleParameters = new BasemapStyleParameters(); diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Map/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.xaml.cs b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Map/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.xaml.cs index ce1034d1f0..f00b4b9d27 100644 --- a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Map/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.xaml.cs +++ b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Map/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.xaml.cs @@ -62,6 +62,9 @@ private void BasemapStyleGallery_SelectionChanged(object sender, SelectionChange private void LoadButton_Click(object sender, RoutedEventArgs e) { + // Return if no basemap style is selected. + if (BasemapStyleGallery.SelectedItem == null) return; + // Create a new basemap style parameters object. var basemapStyleParameters = new BasemapStyleParameters();