kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Possibly fix a crash in image loader.

Browse source
This commit is contained in:
John Preston 2018-12-05 15:50:41 +04:00
parent 310c68a744
commit f59e824ec1
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Telegram/SourceFiles/ui/image/image.h
View file

@ -45,6 +45,13 @@ ImagePtr Create(const GeoPointLocation &location);
class Source { class Source {
public: public:
Source() = default;
Source(const Source &other) = delete;
Source(Source &&other) = delete;
Source &operator=(const Source &other) = delete;
Source &operator=(Source &&other) = delete;
virtual ~Source() = default;
virtual void load( virtual void load(
Data::FileOrigin origin, Data::FileOrigin origin,
bool loadFirst, bool loadFirst,
@ -83,8 +90,6 @@ public:
virtual QByteArray bytesForCache() = 0; virtual QByteArray bytesForCache() = 0;
virtual ~Source() = default;
}; };
} // namespace Images } // namespace Images

2
Telegram/SourceFiles/ui/image/image_source.cpp
View file

@ -325,6 +325,8 @@ void RemoteSource::loadLocal() {
void RemoteSource::setImageBytes(const QByteArray &bytes) { void RemoteSource::setImageBytes(const QByteArray &bytes) {
if (bytes.isEmpty()) { if (bytes.isEmpty()) {
return; return;
} else if (loaderValid()) {
unload();
} }
_loader = createLoader({}, LoadFromLocalOnly, true); _loader = createLoader({}, LoadFromLocalOnly, true);
_loader->finishWithBytes(bytes); _loader->finishWithBytes(bytes);