diff --git a/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp b/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp index 73bed1c017..3d13095640 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp @@ -43,10 +43,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL namespace Dialogs { namespace { -[[nodiscard]] Window::SessionController *FindSessionController( +[[nodiscard]] not_null FindSessionController( not_null widget) { const auto window = Core::App().findWindow(widget); - return window ? window->sessionController() : nullptr; + Assert(window != nullptr); + return window->sessionController(); } constexpr auto kSugSetBirthday = "BIRTHDAY_SETUP"_cs; @@ -125,9 +126,6 @@ rpl::producer*> TopBarSuggestionValue( content->setRightIcon(RightIcon::Close); content->setClickedCallback([=] { const auto controller = FindSessionController(parent); - if (!controller) { - return; - } UrlClickHandler::Open( u"https://t.me/premiumbot?start=status"_q, QVariant::fromValue(ClickHandlerContext{ @@ -161,9 +159,6 @@ rpl::producer*> TopBarSuggestionValue( content->setRightIcon(RightIcon::Close); content->setClickedCallback([=] { const auto controller = FindSessionController(parent); - if (!controller) { - return; - } controller->uiShow()->show(Box( Settings::SmallBalanceBox, controller->uiShow(), @@ -234,11 +229,8 @@ rpl::producer*> TopBarSuggestionValue( repeat(repeat); return; } + const auto controller = FindSessionController(parent); - if (!controller) { - repeat(repeat); - return; - } const auto isSingle = users.size() == 1; const auto first = session->data().user(users.front()); content->setRightIcon(RightIcon::Close); @@ -364,9 +356,6 @@ rpl::producer*> TopBarSuggestionValue( content->setRightIcon(RightIcon::Close); content->setClickedCallback([=] { const auto controller = FindSessionController(parent); - if (!controller) { - return; - } Core::App().openInternalUrl( u"internal:edit_birthday:add_privacy"_q, QVariant::fromValue(ClickHandlerContext{ @@ -426,9 +415,6 @@ rpl::producer*> TopBarSuggestionValue( description(tr::now, TextWithEntities::Simple)); content->setClickedCallback([=] { const auto controller = FindSessionController(parent); - if (!controller) { - return; - } Settings::ShowPremium(controller, "dialogs_hint"); config->dismissSuggestion(isPremiumAnnual ? kSugPremiumAnnual.utf8() @@ -459,9 +445,6 @@ rpl::producer*> TopBarSuggestionValue( if (config->suggestionCurrent(kSugSetUserpic.utf8()) && !session->user()->userpicPhotoId()) { const auto controller = FindSessionController(parent); - if (!controller) { - return; - } content->setRightIcon(RightIcon::Close); const auto upload = Ui::CreateChild( content,