From 2444acb0415714f0aa4e7325e52fc0a3d2bd09c9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 9 Oct 2018 13:27:44 +0300
Subject: [PATCH] Fix image data forgetting.

In case image was almost loaded (loader was ready, but not destroyed yet),
forget() didn't do anything, leaving bytes and image inside loader untouched.

Now we check loader state in forget() so that bytes and image are passed to
Image instance before they're forgot from the memory. This will improve memory
clearing while scrolling through chats with images and switching between them.
---
 Telegram/SourceFiles/ui/images.cpp | 9 +++++----
 Telegram/SourceFiles/ui/images.h   | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/ui/images.cpp b/Telegram/SourceFiles/ui/images.cpp
index c35b32d20..977a692fa 100644
--- a/Telegram/SourceFiles/ui/images.cpp
+++ b/Telegram/SourceFiles/ui/images.cpp
@@ -450,7 +450,7 @@ ImagePtr::ImagePtr(int32 width, int32 height, const MTPFileLocation &location, I
 	Parent((location.type() == mtpc_fileLocation) ? (Image*)(internal::getImage(StorageImageLocation(width, height, location.c_fileLocation()))) : def.v()) {
 }
 
-Image::Image(const QString &file, QByteArray fmt) : _forgot(false) {
+Image::Image(const QString &file, QByteArray fmt) {
 	_data = App::pixmapFromImageInPlace(App::readImage(file, &fmt, false, 0, &_saved));
 	_format = fmt;
 	if (!_data.isNull()) {
@@ -458,7 +458,7 @@ Image::Image(const QString &file, QByteArray fmt) : _forgot(false) {
 	}
 }
 
-Image::Image(const QByteArray &filecontent, QByteArray fmt) : _forgot(false) {
+Image::Image(const QByteArray &filecontent, QByteArray fmt) {
 	_data = App::pixmapFromImageInPlace(App::readImage(filecontent, &fmt, false));
 	_format = fmt;
 	_saved = filecontent;
@@ -467,13 +467,13 @@ Image::Image(const QByteArray &filecontent, QByteArray fmt) : _forgot(false) {
 	}
 }
 
-Image::Image(const QPixmap &pixmap, QByteArray format) : _format(format), _forgot(false), _data(pixmap) {
+Image::Image(const QPixmap &pixmap, QByteArray format) : _format(format), _data(pixmap) {
 	if (!_data.isNull()) {
 		globalAcquiredSize += int64(_data.width()) * _data.height() * 4;
 	}
 }
 
-Image::Image(const QByteArray &filecontent, QByteArray fmt, const QPixmap &pixmap) : _saved(filecontent), _format(fmt), _forgot(false), _data(pixmap) {
+Image::Image(const QByteArray &filecontent, QByteArray fmt, const QPixmap &pixmap) : _saved(filecontent), _format(fmt), _data(pixmap) {
 	_data = pixmap;
 	_format = fmt;
 	_saved = filecontent;
@@ -884,6 +884,7 @@ QPixmap Image::pixBlurredColoredNoCache(
 void Image::forget() const {
 	if (_forgot) return;
 
+	checkload();
 	if (_data.isNull()) return;
 
 	invalidateSizeCache();
diff --git a/Telegram/SourceFiles/ui/images.h b/Telegram/SourceFiles/ui/images.h
index 6edfec9a0..9a8571bd8 100644
--- a/Telegram/SourceFiles/ui/images.h
+++ b/Telegram/SourceFiles/ui/images.h
@@ -429,7 +429,7 @@ public:
 	virtual ~Image();
 
 protected:
-	Image(QByteArray format = "PNG") : _format(format), _forgot(false) {
+	Image(QByteArray format = "PNG") : _format(format) {
 	}
 
 	void restore() const;
@@ -448,7 +448,7 @@ protected:
 	}
 
 	mutable QByteArray _saved, _format;
-	mutable bool _forgot;
+	mutable bool _forgot = false;
 	mutable QPixmap _data;
 
 private: