mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 14:38:15 +00:00
Code Issues Releases Wiki Activity

Simplify media overview layouts.

Browse Source
This commit is contained in:
John Preston
2020-05-21 16:49:47 +04:00
parent 053eace154
commit 58f82620e0
6 changed files with 23 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -689,7 +689,7 @@ void DocumentData::loadThumbnail(Data::FileOrigin origin) {
_thumbnailLoader = nullptr;
_flags |= Flag::ThumbnailFailed;
}, [=] {
if (!_thumbnailLoader->cancelled()) {
if (_thumbnailLoader && !_thumbnailLoader->cancelled()) {
if (auto image = _thumbnailLoader->imageData(); image.isNull()) {
_flags |= Flag::ThumbnailFailed;
} else if (const auto active = activeMediaView()) {
@@ -697,7 +697,7 @@ void DocumentData::loadThumbnail(Data::FileOrigin origin) {
}
}
_thumbnailLoader = nullptr;
}) | rpl::release();
}, _thumbnailLoader->lifetime());
_thumbnailLoader->start();
}
@@ -806,7 +806,7 @@ void DocumentData::finishLoad() {
const auto guard = gsl::finally([&] {
destroyLoader();
});
if (_loader->cancelled()) {
if (!_loader || _loader->cancelled()) {
_flags |= Flag::DownloadCancelled;
return;
}
@@ -1004,7 +1004,7 @@ void DocumentData::handleLoaderUpdates() {
) | rpl::start_with_next_error_done([=] {
_owner->documentLoadProgress(this);
}, [=](bool started) {
if (started) {
if (started && _loader) {
const auto origin = _loader->fileOrigin();
const auto failedFileName = _loader->fileName();
const auto retry = [=] {
@@ -1035,7 +1035,7 @@ void DocumentData::handleLoaderUpdates() {
}, [=] {
finishLoad();
_owner->documentLoadDone(this);
}) | rpl::release();
}, _loader->lifetime());
}