setting exit tour method to internal and calling it when a new workspace is set (#13180)

filipeotero · web-flow · commit 5d18d761a583 · 2022-08-05T12:40:54.000-07:00
diff --git a/src/DynamoCoreWpf/UI/GuidedTour/GuidesManager.cs b/src/DynamoCoreWpf/UI/GuidedTour/GuidesManager.cs
@@ -224,7 +224,7 @@ private void TourFinished(GuidedTourStateEventArgs args)
         /// <summary>
         /// This method exits from tour 
         /// </summary>
-        private void ExitTour()
+        internal void ExitTour()
         {
 
             if (currentGuide != null)
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -1104,6 +1104,7 @@ void _model_PropertyChanged(object sender, PropertyChangedEventArgs e)
                     RaisePropertyChanged("IsPanning");
                     RaisePropertyChanged("IsOrbiting");
                     //RaisePropertyChanged("RunEnabled");
+                    ExitGuidedTourIfOpened();
                     break;
 
                 case "EnablePresetOptions":
@@ -1112,6 +1113,12 @@ void _model_PropertyChanged(object sender, PropertyChangedEventArgs e)
             }
         }
 
+        private void ExitGuidedTourIfOpened()
+        {
+            if (GuideFlowEvents.IsAnyGuideActive)
+                MainGuideManager.ExitTour();
+        }
+
         // TODO(Sriram): This method is currently not used, but it should really 
         // be. It watches property change notifications coming from the current 
         // WorkspaceModel, and then enables/disables 'set timer' button on the UI.

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ private void TourFinished(GuidedTourStateEventArgs args)`
`224`	`224`	`/// <summary>`
`225`	`225`	`/// This method exits from tour`
`226`	`226`	`/// </summary>`
`227`		`- private void ExitTour()`
	`227`	`+ internal void ExitTour()`
`228`	`228`	`{`
`229`	`229`
`230`	`230`	`if (currentGuide != null)`