diff --git a/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs b/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs index 07f7dea9..2199bf41 100644 --- a/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs +++ b/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs @@ -49,7 +49,14 @@ namespace HandyControl.Controls { if (Visibility != Visibility.Visible || _contentPresenter == null) return; - (TransitionStoryboard ?? ResourceHelper.GetResource($"{TransitionMode.ToString()}Transition"))?.Begin(_contentPresenter); + if (TransitionStoryboard != null) + { + TransitionStoryboard.Begin(_contentPresenter); + } + else if (Application.Current != null) + { + ResourceHelper.GetResource($"{TransitionMode.ToString()}Transition")?.Begin(_contentPresenter); + } } public override void OnApplyTemplate() @@ -73,4 +80,4 @@ namespace HandyControl.Controls } } } -} \ No newline at end of file +}