mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-30 22:25:12 +00:00
Code Issues Releases Wiki Activity

Destroy file loaders not delayed.

Browse Source
This commit is contained in:
John Preston
2018-11-23 18:39:14 +04:00
parent 23dc9ef494
commit 3461f3dfc7
7 changed files with 65 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -725,7 +725,7 @@ void DocumentData::performActionOnLoad() {
bool DocumentData::loaded(FilePathResolveType type) const {
if (loading() && _loader->finished()) {
if (_loader->cancelled()) {
destroyLoaderDelayed(CancelledMtpFileLoader);
destroyLoader(CancelledMtpFileLoader);
} else {
auto that = const_cast<DocumentData*>(this);
that->_location = FileLocation(_loader->fileName());
@@ -748,17 +748,20 @@ bool DocumentData::loaded(FilePathResolveType type) const {
}
that->refreshGoodThumbnail();
destroyLoaderDelayed();
destroyLoader();
}
_session->data().notifyDocumentLayoutChanged(this);
}
return !data().isEmpty() || !filepath(type).isEmpty();
}
void DocumentData::destroyLoaderDelayed(mtpFileLoader *newValue) const {
_loader->stop();
auto loader = std::unique_ptr<FileLoader>(std::exchange(_loader, newValue));
_session->downloader().delayedDestroyLoader(std::move(loader));
void DocumentData::destroyLoader(mtpFileLoader *newValue) const {
const auto loader = std::exchange(_loader, newValue);
if (_loader == CancelledMtpFileLoader) {
loader->cancel();
}
loader->stop();
delete loader;
}
bool DocumentData::loading() const {
@@ -838,7 +841,9 @@ void DocumentData::save(
return;
}
if (_loader == CancelledMtpFileLoader) _loader = nullptr;
if (_loader == CancelledMtpFileLoader) {
_loader = nullptr;
}
if (_loader) {
if (!_loader->setFileName(toFile)) {
cancel(); // changes _actionOnLoad
@@ -894,10 +899,7 @@ void DocumentData::cancel() {
return;
}
auto loader = std::unique_ptr<FileLoader>(std::exchange(_loader, CancelledMtpFileLoader));
loader->cancel();
loader->stop();
_session->downloader().delayedDestroyLoader(std::move(loader));
destroyLoader(CancelledMtpFileLoader);
_session->data().notifyDocumentLayoutChanged(this);
if (auto main = App::main()) {
main->documentLoadProgress(this);
@@ -1382,7 +1384,7 @@ void DocumentData::collectLocalData(DocumentData *local) {
DocumentData::~DocumentData() {
if (loading()) {
destroyLoaderDelayed();
destroyLoader();
}
unload();
ActiveCache().remove(this);