From cf9b17f19dd652e806ea0d7c35918238ddf86871 Mon Sep 17 00:00:00 2001 From: xsnakes Date: Mon, 7 Sep 2020 16:29:46 +0300 Subject: [PATCH] Update TransitioningContentControl.cs Fix. Null Exception. When using "ContextMenu" with "TransitioningContentControl" and when "MenuItem" call "Application Shutdown", then the application throws a null exception, because "Application.Current" is null and fadeout animation call "ResourceHelper.GetResource". --- .../Controls/Other/TransitioningContentControl.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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 +}