diff --git a/src/cascadia/TerminalApp/CommandPalette.cpp b/src/cascadia/TerminalApp/CommandPalette.cpp index add9138eafd..6fee50f9a45 100644 --- a/src/cascadia/TerminalApp/CommandPalette.cpp +++ b/src/cascadia/TerminalApp/CommandPalette.cpp @@ -690,7 +690,10 @@ namespace winrt::TerminalApp::implementation { if (const auto tabPaletteItem{ filteredCommand.Item().try_as() }) { - _SwitchToTabRequestedHandlers(*this, tabPaletteItem.Tab()); + if (const auto tab{ tabPaletteItem.Tab() }) + { + _SwitchToTabRequestedHandlers(*this, tab); + } } } } diff --git a/src/cascadia/TerminalApp/TabPaletteItem.cpp b/src/cascadia/TerminalApp/TabPaletteItem.cpp index f7f1fd456dc..baf42fc06c0 100644 --- a/src/cascadia/TerminalApp/TabPaletteItem.cpp +++ b/src/cascadia/TerminalApp/TabPaletteItem.cpp @@ -19,7 +19,7 @@ using namespace winrt::Microsoft::Terminal::Settings::Model; namespace winrt::TerminalApp::implementation { TabPaletteItem::TabPaletteItem(winrt::TerminalApp::TabBase const& tab) : - _Tab(tab) + _tab(tab) { Name(tab.Title()); Icon(tab.Icon()); diff --git a/src/cascadia/TerminalApp/TabPaletteItem.h b/src/cascadia/TerminalApp/TabPaletteItem.h index 4a498e6f766..e5c55798974 100644 --- a/src/cascadia/TerminalApp/TabPaletteItem.h +++ b/src/cascadia/TerminalApp/TabPaletteItem.h @@ -14,9 +14,13 @@ namespace winrt::TerminalApp::implementation TabPaletteItem() = default; TabPaletteItem(winrt::TerminalApp::TabBase const& tab); - GETSET_PROPERTY(winrt::TerminalApp::TabBase, Tab, nullptr); + winrt::TerminalApp::TabBase Tab() const noexcept + { + return _tab.get(); + } private: + winrt::weak_ref _tab; Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker _tabChangedRevoker; }; }