diff --git a/Telegram/SourceFiles/api/api_credits.cpp b/Telegram/SourceFiles/api/api_credits.cpp index ddff600b5..133a9326b 100644 --- a/Telegram/SourceFiles/api/api_credits.cpp +++ b/Telegram/SourceFiles/api/api_credits.cpp @@ -174,7 +174,8 @@ constexpr auto kTransactionsLimit = 100; .balance = status.data().vbalance().v, .subscriptionsMissingBalance = status.data().vsubscriptions_missing_balance().value_or_empty(), - .allLoaded = !status.data().vnext_offset().has_value(), + .allLoaded = !status.data().vnext_offset().has_value() + && !status.data().vsubscriptions_next_offset().has_value(), .token = qs(status.data().vnext_offset().value_or_empty()), .tokenSubscriptions = qs( status.data().vsubscriptions_next_offset().value_or_empty()), diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp index b342ad077..25c1d4f7d 100644 --- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp +++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp @@ -1050,7 +1050,7 @@ void CreditsController::requestNext() { _requesting = false; applySlice(s); }; - if (!_firstSlice.subscriptions.empty()) { + if (_subscription) { return _api.requestSubscriptions(_apiToken, done); } _api.request(_apiToken, done);