the null deref we were talking about

microsoft · Jul 12, 2022 · dab4501 · dab4501
1 parent 9e75f67
commit dab4501
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -4165,9 +4165,9 @@ namespace winrt::TerminalApp::implementation
 
             TitlebarBrush(acrylicBrush);
         }
-        else if (const auto tabRowBg{ _activated ? theme.TabRow().Background() :
-                                                   theme.TabRow().UnfocusedBackground() };
-                 tabRowBg != nullptr && theme.TabRow() != nullptr)
+        else if (auto tabRowBg{ theme.TabRow() ? (_activated ? theme.TabRow().Background() :
+                                                               theme.TabRow().UnfocusedBackground()) :
+                                                 ThemeColor{ nullptr } })
         {
             const auto terminalBrush = [this]() -> Media::Brush {
                 if (const auto& control{ _GetActiveControl() })