procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix crash in SearchController. 

Data::Histories cancels request in Main::Session::api(), so the
request must be sent using this global api(), not custom MTP::Sender.
This commit is contained in:
John Preston 2020-02-25 16:12:04 +04:00
parent cc95117e9b
commit 844e9b60dd
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Telegram/SourceFiles/data/data_search_controller.cpp
View File

@ -194,8 +194,7 @@ SearchController::CacheEntry::CacheEntry(const Query &query)
} }
SearchController::SearchController(not_null<Main::Session*> session) SearchController::SearchController(not_null<Main::Session*> session)
: _session(session) : _session(session) {
, _api(session->api().instance()) {
} }
bool SearchController::hasInCache(const Query &query) const { bool SearchController::hasInCache(const Query &query) const {
@ -372,7 +371,7 @@ void SearchController::requestMore(
const auto type = ::Data::Histories::RequestType::History; const auto type = ::Data::Histories::RequestType::History;
const auto history = _session->data().history(listData->peer); const auto history = _session->data().history(listData->peer);
auto requestId = histories.sendRequest(history, type, [=](Fn<void()> finish) { auto requestId = histories.sendRequest(history, type, [=](Fn<void()> finish) {
return _api.request( return _session->api().request(
std::move(*prepared) std::move(*prepared)
).done([=](const MTPmessages_Messages &result) { ).done([=](const MTPmessages_Messages &result) {
listData->requests.remove(key); listData->requests.remove(key);

1
Telegram/SourceFiles/data/data_search_controller.h
View File

@ -130,7 +130,6 @@ private:
Data *listData); Data *listData);
const not_null<Main::Session*> _session; const not_null<Main::Session*> _session;
MTP::Sender _api;
Cache _cache; Cache _cache;
Cache::iterator _current = _cache.end(); Cache::iterator _current = _cache.end();