RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix collage/slideshow extracting in GCC. 

It was depending on argument evaluation order before that fix.
This commit is contained in:
John Preston 2018-10-26 09:35:57 +04:00
parent 4e6f55e176
commit 3b911f19f6
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Telegram/SourceFiles/data/data_web_page.cpp
View File

@ -89,6 +89,14 @@ WebPageCollage ExtractCollage(const MTPDwebPage &data) {
if (!data.has_cached_page()) {
return {};
}
const auto parseMedia = [&] {
if (data.has_photo()) {
Auth().data().photo(data.vphoto);
}
if (data.has_document()) {
Auth().data().document(data.vdocument);
}
};
return data.vcached_page.match([&](const auto &page) {
for (const auto &block : page.vblocks.v) {
switch (block.type()) {
@ -100,11 +108,13 @@ WebPageCollage ExtractCollage(const MTPDwebPage &data) {
case mtpc_pageBlockAudio:
return WebPageCollage();
case mtpc_pageBlockSlideshow:
parseMedia();
return ExtractCollage(
block.c_pageBlockSlideshow().vitems.v,
page.vphotos.v,
page.vdocuments.v);
case mtpc_pageBlockCollage:
parseMedia();
return ExtractCollage(
block.c_pageBlockCollage().vitems.v,
page.vphotos.v,