mirror of
https://github.com/vale981/tdesktop
synced 2025-03-05 09:41:41 -05:00
Don't load bad image infinitely.
This commit is contained in:
parent
ead212f31b
commit
a10b91fe1a
1 changed files with 7 additions and 3 deletions
|
@ -275,12 +275,16 @@ QImage RemoteSource::takeLoaded() {
|
|||
return QImage();
|
||||
}
|
||||
|
||||
auto data = _loader->imageData(shrinkBox());
|
||||
if (data.isNull()) {
|
||||
if (_loader->cancelled()) {
|
||||
_cancelled = true;
|
||||
destroyLoader();
|
||||
return QImage();
|
||||
}
|
||||
auto data = _loader->imageData(shrinkBox());
|
||||
if (data.isNull()) {
|
||||
// Bad content in the image.
|
||||
data = Image::Empty()->original();
|
||||
}
|
||||
|
||||
setInformation(_loader->bytes().size(), data.width(), data.height());
|
||||
|
||||
|
@ -303,7 +307,7 @@ void RemoteSource::destroyLoader() {
|
|||
|
||||
void RemoteSource::loadLocal() {
|
||||
if (_loader) {
|
||||
return;
|
||||
return;
|
||||
}
|
||||
|
||||
_loader = createLoader(Data::FileOrigin(), LoadFromLocalOnly, true);
|
||||
|
|
Loading…
Add table
Reference in a new issue