update

DynamoDS · Feb 5, 2024 · ea9e968 · ea9e968
1 parent 36dd65c
commit ea9e968
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/src/DynamoCoreWpf/UI/Prompts/CrashPrompt.xaml.cs b/src/DynamoCoreWpf/UI/Prompts/CrashPrompt.xaml.cs
@@ -51,10 +51,10 @@ public CrashPrompt(CrashPromptArgs args, DynamoViewModel dynamoViewModel)
         {
             InitializeComponent();
 
-            var packageLoader = dynamoViewModel.Model.GetPackageManagerExtension()?.PackageLoader;
+            var packageLoader = dynamoViewModel?.Model?.GetPackageManagerExtension()?.PackageLoader;
             markdownPackages = Wpf.Utilities.CrashUtilities.PackagesToMakrdown(packageLoader);
 
-            productName = dynamoViewModel.BrandingResourceProvider.ProductName;
+            productName = dynamoViewModel?.BrandingResourceProvider.ProductName ?? Process.GetCurrentProcess().ProcessName;
             Title = string.Format(Wpf.Properties.Resources.CrashPromptDialogTitle, productName);
             TitleTextBlock.Text = string.Format(Wpf.Properties.Resources.CrashPromptDialogTitle, productName);
             txtOverridingText.Text = string.Format(Wpf.Properties.Resources.CrashPromptDialogCrashMessage, productName);

diff --git a/src/DynamoCoreWpf/Utilities/CrashReportTool.cs b/src/DynamoCoreWpf/Utilities/CrashReportTool.cs
@@ -162,6 +162,21 @@ private static string FindCERToolInInstallLocations()
             }
         }
 
+        internal static void ShowCrashWindow(object sender, CrashPromptArgs args)
+        {
+            var viewModel = sender as DynamoViewModel
+                ;
+            if (CrashReportTool.ShowCrashErrorReportWindow(viewModel,
+                (args is CrashErrorReportArgs cerArgs) ? cerArgs :
+                new CrashErrorReportArgs(args.Details)))
+            {
+                return;
+            }
+            // Backup crash reporting dialog (in case ADSK CER is not found)
+            var prompt = new Nodes.Prompts.CrashPrompt(args, viewModel);
+            prompt.ShowDialog();
+        }
+
         /// <summary>
         /// Calls external CER tool (with UI)
         /// </summary>

diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -701,7 +701,7 @@ protected DynamoViewModel(StartConfiguration startConfiguration)
             this.model = startConfiguration.DynamoModel;
             this.model.CommandStarting += OnModelCommandStarting;
             this.model.CommandCompleted += OnModelCommandCompleted;
-            this.model.RequestsCrashPrompt += Controller_RequestsCrashPrompt;
+            this.model.RequestsCrashPrompt += CrashReportTool.ShowCrashWindow;
 
             this.HideReportOptions = startConfiguration.HideReportOptions;
             UsageReportingManager.Instance.InitializeCore(this);
@@ -776,19 +776,6 @@ protected DynamoViewModel(StartConfiguration startConfiguration)
             MLDataPipelineExtension = model.ExtensionManager.Extensions.OfType<DynamoMLDataPipelineExtension>().FirstOrDefault();
         }
 
-        private void Controller_RequestsCrashPrompt(object sender, CrashPromptArgs args)
-        {
-            if (CrashReportTool.ShowCrashErrorReportWindow(this,
-                (args is CrashErrorReportArgs cerArgs) ? cerArgs :
-                new CrashErrorReportArgs(args.Details)))
-            {
-                return;
-            }
-            // Backup crash reporting dialog (in case ADSK CER is not found)
-            var prompt = new Nodes.Prompts.CrashPrompt(args, this);
-            prompt.ShowDialog();
-        }
-
         private void TaskScheduler_UnobservedTaskException(object sender, UnobservedTaskExceptionEventArgs e)
         {
             try
@@ -824,7 +811,7 @@ private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionE
             }
         }
 
-        internal void CrashGracefully(Exception ex, bool fatal = false)
+        private void CrashGracefully(Exception ex, bool fatal = false)
         {
             try
             {
@@ -3585,7 +3572,7 @@ public bool PerformShutdownSequence(ShutdownParams shutdownParams)
             AppDomain.CurrentDomain.UnhandledException -= CurrentDomain_UnhandledException;
             Dispatcher.CurrentDispatcher.UnhandledException -= CurrentDispatcher_UnhandledException;
             TaskScheduler.UnobservedTaskException -= TaskScheduler_UnobservedTaskException;
-            this.Model.RequestsCrashPrompt -= Controller_RequestsCrashPrompt;
+            this.Model.RequestsCrashPrompt -= CrashReportTool.ShowCrashWindow;
 
             // Request the View layer to close its window (see 
             // ShutdownParams.CloseDynamoView member for details).