DYN-7820 Fix regression (#15666)

DynamoDS · Nov 18, 2024 · 76cbec1 · 76cbec1
1 parent ab2f503
commit 76cbec1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
@@ -186,7 +186,7 @@ private void SetFilterHosts(object obj)
                     Dynamo.Logging.Analytics.TrackEvent(
                         Actions.Filter,
                         Categories.PackageManagerOperations,
-                        pmSearchViewModel.CompatibilityFilter.FirstOrDefault(x=>x.OnChecked).FilterName);
+                        pmSearchViewModel.CompatibilityFilter.FirstOrDefault(x=>x.OnChecked)?.FilterName);
                 }
                 pmSearchViewModel.SearchAndUpdateResults();
                 return;

diff --git a/src/LibraryViewExtensionWebView2/ViewExtension.cs b/src/LibraryViewExtensionWebView2/ViewExtension.cs
@@ -43,8 +43,8 @@ public void Loaded(ViewLoadedParams viewLoadedParams)
                 viewParams = viewLoadedParams;
                 controller = new LibraryViewController(viewLoadedParams.DynamoWindow, viewLoadedParams.CommandExecutive, customization);
                 (viewLoadedParams.DynamoWindow.DataContext as DynamoViewModel).PropertyChanged += handleDynamoViewPropertyChanges;
+                viewParams.CurrentWorkspaceChanged += ViewParams_CurrentWorkspaceChanged;
             }
-            viewParams.CurrentWorkspaceChanged += ViewParams_CurrentWorkspaceChanged;
         }
 
         private void ViewParams_CurrentWorkspaceChanged(IWorkspaceModel workspace)