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

Fix crash in stickers.

This commit is contained in:
John Preston 2020-05-31 12:18:24 +04:00
parent 9b574e497d
commit f4cd84c313
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/apiwrap.cpp
View File

@ -3344,7 +3344,7 @@ void ApiWrap::readFeaturedSetDelayed(uint64 setId) {
} }
void ApiWrap::readFeaturedSets() { void ApiWrap::readFeaturedSets() {
auto &sets = _session->data().stickerSetsRef(); const auto &sets = _session->data().stickerSets();
auto count = _session->data().featuredStickerSetsUnreadCount(); auto count = _session->data().featuredStickerSetsUnreadCount();
QVector<MTPlong> wrappedIds; QVector<MTPlong> wrappedIds;
wrappedIds.reserve(_featuredSetsRead.size()); wrappedIds.reserve(_featuredSetsRead.size());

2
Telegram/SourceFiles/boxes/sticker_set_box.cpp
View File

@ -307,7 +307,7 @@ void StickerSetBox::Inner::gotSet(const MTPmessages_StickerSet &set) {
} else { } else {
_setThumbnail = ImageWithLocation(); _setThumbnail = ImageWithLocation();
} }
auto &sets = _controller->session().data().stickerSetsRef(); const auto &sets = _controller->session().data().stickerSets();
const auto it = sets.find(_setId); const auto it = sets.find(_setId);
if (it != sets.cend()) { if (it != sets.cend()) {
const auto set = it->second.get(); const auto set = it->second.get();

8
Telegram/SourceFiles/boxes/stickers_box.cpp
View File

@ -497,8 +497,8 @@ QPixmap StickersBox::grabContentCache() {
} }
void StickersBox::installSet(uint64 setId) { void StickersBox::installSet(uint64 setId) {
auto &sets = _session->data().stickerSetsRef(); const auto &sets = _session->data().stickerSets();
auto it = sets.find(setId); const auto it = sets.find(setId);
if (it == sets.cend()) { if (it == sets.cend()) {
rebuildList(); rebuildList();
return; return;
@ -535,8 +535,8 @@ void StickersBox::installDone(const MTPmessages_StickerSetInstallResult &result)
bool StickersBox::installFail(uint64 setId, const RPCError &error) { bool StickersBox::installFail(uint64 setId, const RPCError &error) {
if (MTP::isDefaultHandledError(error)) return false; if (MTP::isDefaultHandledError(error)) return false;
auto &sets = _session->data().stickerSetsRef(); const auto &sets = _session->data().stickerSets();
auto it = sets.find(setId); const auto it = sets.find(setId);
if (it == sets.cend()) { if (it == sets.cend()) {
rebuildList(); rebuildList();
return true; return true;

8
Telegram/SourceFiles/chat_helpers/stickers.cpp
View File

@ -173,8 +173,8 @@ void InstallLocally(uint64 setId) {
} }
void UndoInstallLocally(uint64 setId) { void UndoInstallLocally(uint64 setId) {
auto &sets = Auth().data().stickerSetsRef(); const auto &sets = Auth().data().stickerSets();
auto it = sets.find(setId); const auto it = sets.find(setId);
if (it == sets.end()) { if (it == sets.end()) {
return; return;
} }
@ -400,7 +400,7 @@ void SetsReceived(const QVector<MTPStickerSet> &data, int32 hash) {
} }
auto writeRecent = false; auto writeRecent = false;
auto &recent = GetRecentPack(); auto &recent = GetRecentPack();
for (auto it = sets.begin(), e = sets.end(); it != e;) { for (auto it = sets.begin(); it != sets.end();) {
const auto set = it->second.get(); const auto set = it->second.get();
bool installed = (set->flags & MTPDstickerSet::Flag::f_installed_date); bool installed = (set->flags & MTPDstickerSet::Flag::f_installed_date);
bool featured = (set->flags & MTPDstickerSet_ClientFlag::f_featured); bool featured = (set->flags & MTPDstickerSet_ClientFlag::f_featured);
@ -657,7 +657,7 @@ void FeaturedSetsReceived(
} }
auto unreadCount = 0; auto unreadCount = 0;
for (auto it = sets.begin(), e = sets.end(); it != e;) { for (auto it = sets.begin(); it != sets.end();) {
const auto set = it->second.get(); const auto set = it->second.get();
bool installed = (set->flags & MTPDstickerSet::Flag::f_installed_date); bool installed = (set->flags & MTPDstickerSet::Flag::f_installed_date);
bool featured = (set->flags & MTPDstickerSet_ClientFlag::f_featured); bool featured = (set->flags & MTPDstickerSet_ClientFlag::f_featured);

1
Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
View File

@ -2638,7 +2638,6 @@ std::vector<StickerIcon> StickersListWidget::fillIcons() {
result.emplace_back(Stickers::RecentSetId); result.emplace_back(Stickers::RecentSetId);
} }
} }
const auto &sets = session().data().stickerSets();
for (auto l = _mySets.size(); i != l; ++i) { for (auto l = _mySets.size(); i != l; ++i) {
if (_mySets[i].id == Stickers::MegagroupSetId) { if (_mySets[i].id == Stickers::MegagroupSetId) {
result.emplace_back(Stickers::MegagroupSetId); result.emplace_back(Stickers::MegagroupSetId);