Fixing selection issues for ribbon tabs

fluentribbon · Mar 31, 2018 · 99fd3f3 · 99fd3f3
1 parent c1220c8
commit 99fd3f3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Fluent.Ribbon/Controls/RibbonTabItem.cs b/Fluent.Ribbon/Controls/RibbonTabItem.cs
@@ -784,10 +784,10 @@ private static void OnIsSelectedChanged(DependencyObject d, DependencyPropertyCh
             var newValue = (bool)e.NewValue;
             if (newValue)
             {
-                if (container.TabControlParent != null
+                if (container.TabControlParent?.SelectedTabItem != null
                     && ReferenceEquals(container.TabControlParent.SelectedTabItem, container) == false)
                 {
-                    ((RibbonTabItem)container.TabControlParent.SelectedItem).IsSelected = false;
+                    container.TabControlParent.SelectedTabItem.IsSelected = false;
                 }
 
                 container.OnSelected(new RoutedEventArgs(Selector.SelectedEvent, container));