Fix guided tour crash

src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs

@@ -2362,7 +2362,7 @@ private void CloseHomeWorkspace(object parameter)
 
         private bool CanCloseHomeWorkspace(object parameter)
         {
-            return HomeSpace.RunSettings.RunEnabled;
+            return HomeSpace.RunSettings.RunEnabled || RunSettings.ForceBlockRun;
         }
 
         /// <summary>

src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs

@@ -1281,7 +1281,7 @@ private void Hide(object parameters)
             // if there are no other custom workspace that is opened.
             // 
 
-            if (this.IsHomeSpace)
+            if (IsHomeSpace)
             {
                 if (DynamoViewModel.CloseHomeWorkspaceCommand.CanExecute(null))
                     DynamoViewModel.CloseHomeWorkspaceCommand.Execute(null);

src/DynamoCoreWpf/Views/FileTrust/FileTrustWarning.xaml.cs

@@ -3,6 +3,7 @@
 using System.Windows.Controls.Primitives;
 using System.Windows.Threading;
 using Dynamo.Controls;
+using Dynamo.Graph.Workspaces;
 using Dynamo.Models;
 using Dynamo.ViewModels;
 using Dynamo.Wpf.Utilities;
@@ -40,16 +41,18 @@ public FileTrustWarning(DynamoView dynamoViewWindow)
             DataContext = fileTrustWarningViewModel;
 
             if (dynamoViewWindow == null) return;
-          
+
             //Creating the background of the Popup
             BackgroundRectangle.Rect = new Rect(fileTrustWarningViewModel.PopupBordersOffSet, fileTrustWarningViewModel.PopupBordersOffSet, fileTrustWarningViewModel.PopupRectangleWidth, fileTrustWarningViewModel.PopupRectangleHeight);
             SetUpPopup();
+
+            HomeWorkspaceModel.WorkspaceClosed += CloseWarningPopup;
         }
 
         private void ViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
             //When the ShowWarningPopup property is changed we need to enable or disable the Dynamo Run section
-            if (e.PropertyName == nameof(FileTrustWarningViewModel.ShowWarningPopup) )
+            if (e.PropertyName == nameof(FileTrustWarningViewModel.ShowWarningPopup))
             {
                 var fileTrustWarningViewModel = sender as FileTrustWarningViewModel;
                 if (fileTrustWarningViewModel == null) return;
@@ -59,12 +62,11 @@ private void ViewModel_PropertyChanged(object sender, System.ComponentModel.Prop
                     //Force to run all the drawing events in the Dispatcher so later we can disable the button/combobox in the Run section
                     mainWindow.Dispatcher.Invoke(DispatcherPriority.Background, new Action(delegate { }));
                     DisableRunInteractivity();
-                }                   
+                }
                 else
                 {
                     EnableRunInteractivity();
                 }
-
             }
         }
 
@@ -126,11 +128,11 @@ private void YesButton_Click(object sender, RoutedEventArgs e)
         {
             fileTrustWarningViewModel.AllowOneTimeTrust = true;
             fileTrustWarningViewModel.ShowWarningPopup = false;
-            
+
             RunSettings.ForceBlockRun = false;
             if (FileTrustWarningCheckBox.IsChecked.Value == true)
             {
-                if(dynViewModel.PreferenceSettings.AddTrustedLocation(fileTrustWarningViewModel.DynFileDirectoryName))
+                if (dynViewModel.PreferenceSettings.AddTrustedLocation(fileTrustWarningViewModel.DynFileDirectoryName))
                     dynViewModel.MainGuideManager.CreateRealTimeInfoWindow(string.Format(Properties.Resources.TrustLocationAddedNotification, fileTrustWarningViewModel.DynFileDirectoryName));
             }
             if (dynViewModel.CurrentSpaceViewModel.RunSettingsViewModel.Model.RunType != RunType.Manual)
@@ -162,10 +164,12 @@ internal void UpdatePopupLocation()
         internal void CleanPopup()
         {
             if (fileTrustWarningViewModel != null)
-            { 
+            {
                 fileTrustWarningViewModel.PropertyChanged -= ViewModel_PropertyChanged;
                 fileTrustWarningViewModel.DynFileDirectoryName = string.Empty;
             }
+
+            HomeWorkspaceModel.WorkspaceClosed -= CloseWarningPopup;
         }
 
         /// <summary>
@@ -186,5 +190,14 @@ private void SetUpPopup()
                 fileTrustWarningViewModel.PropertyChanged += ViewModel_PropertyChanged;
             }
         }
+
+        /// <summary>
+        /// Close the warning popup
+        /// </summary>
+        internal void CloseWarningPopup()
+        {
+            fileTrustWarningViewModel.ShowWarningPopup = false;
+            fileTrustWarningViewModel.DynFileDirectoryName = string.Empty;
+        }
     }
 }

test/DynamoCoreWpfTests/DynamoViewTests.cs

@@ -105,5 +105,23 @@ public void FooterNotificationControlTest()
             // After deleting all Warning nodes, the counter should get to 0 
             Assert.AreEqual((items[1] as FooterNotificationItem).NotificationCount, 0);
         }
+
+        [Test]
+        public void OpeningWorkspaceWithTrustWarning()
+        {
+            // Open workspace with test mode as false, to verify trust warning.
+            DynamoModel.IsTestMode = false;
+            Open(@"core\CustomNodes\TestAdd.dyn");
+
+            Assert.IsTrue(ViewModel.FileTrustViewModel.ShowWarningPopup);
+
+            // Close workspace
+            Assert.IsTrue(ViewModel.CloseHomeWorkspaceCommand.CanExecute(null));
+            ViewModel.CloseHomeWorkspaceCommand.Execute(null);
+
+            // Asert that the warning popup is closed, when the workspace is closed.
+            Assert.IsFalse(ViewModel.FileTrustViewModel.ShowWarningPopup);
+            DynamoModel.IsTestMode = true;
+        }
     }
 }