From c16e377bc61b93ce8947b192d16d72bd5fd21daa Mon Sep 17 00:00:00 2001 From: Marcus Wichelmann Date: Thu, 2 Apr 2020 16:08:38 +0200 Subject: [PATCH] Fix crash caused by window decorations not being available when using remote rendering --- samples/ControlCatalog/MainView.xaml.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/samples/ControlCatalog/MainView.xaml.cs b/samples/ControlCatalog/MainView.xaml.cs index 5f71b2ecd9..7c17b125d6 100644 --- a/samples/ControlCatalog/MainView.xaml.cs +++ b/samples/ControlCatalog/MainView.xaml.cs @@ -60,8 +60,8 @@ namespace ControlCatalog var decorations = this.Find("Decorations"); decorations.SelectionChanged += (sender, e) => { - Window window = (Window)VisualRoot; - window.SystemDecorations = (SystemDecorations)decorations.SelectedIndex; + if (VisualRoot is Window window) + window.SystemDecorations = (SystemDecorations)decorations.SelectedIndex; }; } @@ -69,7 +69,8 @@ namespace ControlCatalog { base.OnAttachedToVisualTree(e); var decorations = this.Find("Decorations"); - decorations.SelectedIndex = (int)((Window)VisualRoot).SystemDecorations; + if (VisualRoot is Window window) + decorations.SelectedIndex = (int)window.SystemDecorations; } } }