diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index d9595bc2a..cf5415732 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -776,13 +776,11 @@ void ApiWrap::requestMoreDialogs(Data::Folder *folder) { }); if (!folder) { - requestDialogs(folder); - requestContacts(); - if (!_dialogsLoadState - || (!_dialogsLoadState->listReceived - && !_dialogsLoadState->requestId)) { + if (!_dialogsLoadState || !_dialogsLoadState->listReceived) { refreshDialogsLoadBlocked(); } + requestDialogs(folder); + requestContacts(); } _session->data().chatsListChanged(folder); }).fail([=](const RPCError &error) { @@ -923,6 +921,7 @@ void ApiWrap::requestMoreBlockedByDateDialogs() { _dialogsLoadTill = _dialogsLoadState->offsetDate ? (_dialogsLoadState->offsetDate - max) : (unixtime() - max); + refreshDialogsLoadBlocked(); requestDialogs(); } diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp index 517947d85..6a8eb030f 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp @@ -671,6 +671,7 @@ void Widget::refreshLoadMoreButton(bool mayBlock, bool isBlocked) { st::dialogsLoadMoreButton, st::dialogsLoadMore, st::dialogsLoadMore); + _loadMoreChats->show(); _loadMoreChats->addClickHandler([=] { loadMoreBlockedByDate(); });