diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h index 9a1e736d99..581bfdc002 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_widget.h +++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h @@ -264,7 +264,7 @@ private: bool forceFullCancel = false; bool jumpBackToSearchedChat = false; }; - bool cancelSearch(CancelSearchOptions options = {}); + bool cancelSearch(CancelSearchOptions options); MTP::Sender _api; diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp index c42b611e97..91a8c1625b 100644 --- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp +++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp @@ -165,7 +165,7 @@ QImage GenerateStars(int height, int count) { void FillCreditOptions( not_null controller, not_null container, - int minCredits, + int minimumCredits, Fn paid) { const auto options = container->add( object_ptr>( @@ -191,6 +191,10 @@ void FillCreditOptions( - st.iconLeft - singleStarWidth; const auto buttonHeight = st.height + rect::m::sum::v(st.padding); + const auto minCredits = (!options.empty() + && (minimumCredits > options.back().credits)) + ? 0 + : minimumCredits; for (auto i = 0; i < options.size(); i++) { const auto &option = options[i]; if (option.credits < minCredits) {