Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
30 changes: 24 additions & 6 deletions src/DynamoCoreWpf/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion src/DynamoCoreWpf/Properties/Resources.en-US.resx
Original file line number Diff line number Diff line change
Expand Up @@ -4241,4 +4241,10 @@ To open this graph in Dynamo 3.3–3.6.x: Install the PythonNet package from the
<data name="ToastHyperlinkPathText" xml:space="preserve">
<value>here</value>
</data>
</root>
<data name="DynamoSplashScreen" xml:space="preserve">
<value>Dynamo Splash Screen</value>
</data>
<data name="DynamoSplashScreenFailed" xml:space="preserve">
<value>Failed to load splash content</value>
</data>
</root>
8 changes: 7 additions & 1 deletion src/DynamoCoreWpf/Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -4228,4 +4228,10 @@ To open this graph in Dynamo 3.3–3.6.x: Install the PythonNet package from the
<data name="ToastHyperlinkPathText" xml:space="preserve">
<value>here</value>
</data>
</root>
<data name="DynamoSplashScreen" xml:space="preserve">
<value>Dynamo Splash Screen</value>
</data>
<data name="DynamoSplashScreenFailed" xml:space="preserve">
<value>Failed to load splash content</value>
</data>
</root>
15 changes: 15 additions & 0 deletions src/DynamoCoreWpf/Views/SplashScreen/SplashScreen.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using Dynamo.Core;
using Dynamo.Logging;
using Dynamo.Models;
using Dynamo.UI.Prompts;
using Dynamo.Utilities;
using Dynamo.ViewModels;
using Dynamo.Wpf.Utilities;
Expand Down Expand Up @@ -132,6 +133,20 @@ public void OnRequestDynamicSplashScreen()
/// </summary>
public void OnRequestStaticSplashScreen()
{
if (viewModel == null)
{
Dispatcher.Invoke(() =>
{
DynamoMessageBox.Show(
owner: this,
messageBoxText: Wpf.Properties.Resources.DynamoSplashScreenFailed,
caption: Wpf.Properties.Resources.DynamoSplashScreen,
MessageBoxButton.OK,
MessageBoxImage.Warning
);
});
this.Close();
Copy link

Copilot AI Dec 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code continues to execute line 150 (StaticSplashScreenReady?.Invoke()) even after closing the splash screen when viewModel is null. Add a return statement after this.Close() to prevent invoking the event on a closed/invalid splash screen.

Suggested change
this.Close();
this.Close();
return;

Copilot uses AI. Check for mistakes.
}
StaticSplashScreenReady?.Invoke();
}

Expand Down
Loading