comments

zeusongit · Nov 29, 2023 · 3b6f454 · 3b6f454
1 parent e936747
commit 3b6f454
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs
@@ -1456,6 +1456,11 @@ public void Dispose()
             {
                 SearchModel.ItemProduced -= SearchModel_ItemProduced;
             }
+            //handle the disposal of IDSDK manager instance for sandbox
+            if(AuthenticationManager.AuthProvider is IDSDKManager)
+            {
+                (AuthenticationManager.AuthProvider as IDSDKManager).Dispose();
+            }
         }
 
         private void InitializeCustomNodeManager()

diff --git a/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs b/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs
@@ -18,7 +18,7 @@ namespace Dynamo.UI.Controls
     /// <summary>
     /// An object which provides the data for the shortcut toolbar.
     /// </summary>
-    public partial class ShortcutToolbar : UserControl
+    public partial class ShortcutToolbar : UserControl, IDisposable
     {
         private readonly ObservableCollection<ShortcutBarItem> shortcutBarItems;
         private readonly ObservableCollection<ShortcutBarItem> shortcutBarRightSideItems;
@@ -65,7 +65,6 @@ public ShortcutToolbar(DynamoViewModel dynamoViewModel)
             }
 
             this.Loaded += ShortcutToolbar_Loaded;
-            this.Unloaded += ShortcutToolbar_Unloaded;
         }
 
         private void ShortcutToolbar_Loaded(object sender, RoutedEventArgs e)
@@ -75,11 +74,13 @@ private void ShortcutToolbar_Loaded(object sender, RoutedEventArgs e)
             DynamoViewModel.OnRequestShorcutToolbarLoaded(RightMenu.ActualWidth);
         }
 
-        private void ShortcutToolbar_Unloaded(object sender, RoutedEventArgs e)
+        public void Dispose()
         {
-            authManager.LoginStateChanged -= AuthChangeHandler;
+            if(authManager != null)
+            {
+                authManager.LoginStateChanged -= AuthChangeHandler;
+            }
             this.Loaded -= ShortcutToolbar_Loaded;
-            this.Unloaded -= ShortcutToolbar_Unloaded;
         }
 
         private void AuthChangeHandler(LoginState status)

diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
@@ -2963,6 +2963,7 @@ public void Dispose()
 
             // Removing the tab items list handler
             dynamoViewModel.SideBarTabItems.CollectionChanged -= this.OnCollectionChanged;
+            shortcutBar?.Dispose();
 
             if (fileTrustWarningPopup != null)
             {

diff --git a/src/DynamoCoreWpf/Views/SplashScreen/SplashScreen.xaml.cs b/src/DynamoCoreWpf/Views/SplashScreen/SplashScreen.xaml.cs
@@ -407,8 +407,7 @@ internal async void HandleSignInStatusChange(bool status)
         {
             if (webView?.CoreWebView2 != null)
             {
-                await webView.CoreWebView2.ExecuteScriptAsync("window.handleSignInStateChange({" +
-                $"status: \"" + status + "\"})");
+                await webView.CoreWebView2.ExecuteScriptAsync($"window.handleSignInStateChange({{\"status\": \"{status}\"}})");
             }
         }