DYN-8749 Handle crash when closing splash screen after DynamoView load (#16175)

zeusongit · web-flow · commit 3bd3a1a12d06 · 2025-05-05T12:02:51.000-04:00
diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs
@@ -1460,7 +1460,7 @@ public void Dispose()
             }
 
             // Lucene disposals (just if LuceneNET was initialized)
-            LuceneUtility.DisposeAll();
+            LuceneUtility?.DisposeAll();
 
 #if DEBUG
             CurrentWorkspace.NodeAdded -= CrashOnDemand.CurrentWorkspace_NodeAdded;
diff --git a/src/DynamoCoreWpf/Views/SplashScreen/SplashScreen.xaml.cs b/src/DynamoCoreWpf/Views/SplashScreen/SplashScreen.xaml.cs
@@ -407,11 +407,19 @@ internal async void SetBarProperties(string version, string loadingDescription,
 
         internal async void SetLoadingDone()
         {
-            if (webView?.CoreWebView2 != null)
+            try
+            {
+                if (webView?.CoreWebView2 != null)
+                {
+                    await webView.CoreWebView2.ExecuteScriptAsync($"window.setLoadingDone()");
+                    await webView.CoreWebView2.ExecuteScriptAsync($"window.setTotalLoadingTime(\"{Wpf.Properties.Resources.SplashScreenTotalLoadingTimeLabel} {totalLoadingTime}ms\")");
+                    SetSignInEnable(enableSignInButton);
+                }
+            }
+            catch (Exception ex)
             {
-                await webView.CoreWebView2.ExecuteScriptAsync($"window.setLoadingDone()");
-                await webView.CoreWebView2.ExecuteScriptAsync($"window.setTotalLoadingTime(\"{Wpf.Properties.Resources.SplashScreenTotalLoadingTimeLabel} {totalLoadingTime}ms\")");
-                SetSignInEnable(enableSignInButton);
+                Console.WriteLine(ex.Message);
+                return;
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1460,7 +1460,7 @@ public void Dispose()`
`1460`	`1460`	`}`
`1461`	`1461`
`1462`	`1462`	`// Lucene disposals (just if LuceneNET was initialized)`
`1463`		`- LuceneUtility.DisposeAll();`
	`1463`	`+ LuceneUtility?.DisposeAll();`
`1464`	`1464`
`1465`	`1465`	`#if DEBUG`
`1466`	`1466`	`CurrentWorkspace.NodeAdded -= CrashOnDemand.CurrentWorkspace_NodeAdded;`
Original file line number	Diff line number	Diff line change
`@@ -407,11 +407,19 @@ internal async void SetBarProperties(string version, string loadingDescription,`
`407`	`407`
`408`	`408`	`internal async void SetLoadingDone()`
`409`	`409`	`{`
`410`		`- if (webView?.CoreWebView2 != null)`
	`410`	`+ try`
	`411`	`+ {`
	`412`	`+ if (webView?.CoreWebView2 != null)`
	`413`	`+ {`
	`414`	`+ await webView.CoreWebView2.ExecuteScriptAsync($"window.setLoadingDone()");`
	`415`	`+ await webView.CoreWebView2.ExecuteScriptAsync($"window.setTotalLoadingTime(\"{Wpf.Properties.Resources.SplashScreenTotalLoadingTimeLabel} {totalLoadingTime}ms\")");`
	`416`	`+ SetSignInEnable(enableSignInButton);`
	`417`	`+ }`
	`418`	`+ }`
	`419`	`+ catch (Exception ex)`
`411`	`420`	`{`
`412`		`- await webView.CoreWebView2.ExecuteScriptAsync($"window.setLoadingDone()");`
`413`		`- await webView.CoreWebView2.ExecuteScriptAsync($"window.setTotalLoadingTime(\"{Wpf.Properties.Resources.SplashScreenTotalLoadingTimeLabel} {totalLoadingTime}ms\")");`
`414`		`- SetSignInEnable(enableSignInButton);`
	`421`	`+ Console.WriteLine(ex.Message);`
	`422`	`+ return;`
`415`	`423`	`}`
`416`	`424`	`}`
`417`	`425`