Fixing TabView null ref crash (#6987)

microsoft · Apr 18, 2022 · e25a162 · e25a162
1 parent e754cfb
commit e25a162
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/dev/TabView/TabView.cpp b/dev/TabView/TabView.cpp
@@ -702,20 +702,23 @@ void TabView::OnItemsPresenterSizeChanged(const winrt::IInspectable& sender, con
 
 void TabView::BringSelectedTabIntoView()
 {
-    if(SelectedItem())
+    if (SelectedItem())
     {
         auto tvi = SelectedItem().try_as<winrt::TabViewItem>();
         if (!tvi)
         {
             tvi = ContainerFromItem(SelectedItem()).try_as<winrt::TabViewItem>();
         }
-        winrt::get_self<TabViewItem>(tvi)->StartBringTabIntoView();
+        if (tvi)
+        {
+            winrt::get_self<TabViewItem>(tvi)->StartBringTabIntoView();
+        }
     }
 }
 
 void TabView::OnItemsChanged(winrt::IInspectable const& item)
 {
-    if(m_isDragging)
+    if (m_isDragging)
     {
         return;
     }