Skip to content

[Cherry-pick] DYN-10383: Fix SplashScreen close re-entrancy crash in LaunchDynamo #17041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jasonstratton merged 2 commits into from
Apr 10, 2026
Merged

[Cherry-pick] DYN-10383: Fix SplashScreen close re-entrancy crash in LaunchDynamo #17041

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55088c3
Fix SplashScreen close re-entrancy crash in LaunchDynamo
jasonstratton Apr 9, 2026
9a63a34
Use lambda instead of new Action(Close) for deferred close
jasonstratton Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/DynamoCoreWpf/Views/SplashScreen/SplashScreen.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,9 +331,16 @@ private void LaunchDynamo(bool isCheckboxChecked)
viewModel.PreferenceSettings.EnableStaticSplashScreen = !isCheckboxChecked;
}
currentCloseMode = CloseMode.ByStartingDynamo;
Close();

dynamoView?.Show();
dynamoView?.Activate();

// Defer closing the splash screen until the dispatcher is idle.
// This method is invoked from a WebView2 JS-to-.NET callback, so calling Close()
// synchronously can trigger webView.Dispose() while still inside that callback,
// causing re-entrancy crashes. Showing dynamoView first ensures WPF always has a
// visible window, preventing ShutdownMode.OnLastWindowClose from terminating the app.
Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.ApplicationIdle, () => Close());
}

private void OnLoginStateChanged(LoginState state)
Expand Down
Loading