From 39777f61492c0655ff77232d72862c9a05ba6835 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 2 Nov 2020 10:07:03 +0300
Subject: [PATCH] Fix compress images with drag-n-drop.

Fixes #8943.
---
 Telegram/SourceFiles/boxes/send_files_box.cpp | 32 +++++++++++--------
 Telegram/SourceFiles/boxes/send_files_box.h   |  1 +
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index 79cf159dd3..f7b7dd7af2 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -924,6 +924,22 @@ void SendFilesBox::setInnerFocus() {
 	}
 }
 
+void SendFilesBox::saveSendWaySettings() {
+	auto way = _sendWay.current();
+	auto oldWay = Core::App().settings().sendFilesWay();
+	if (_groupFiles->isHidden()) {
+		way.setGroupFiles(oldWay.groupFiles());
+	}
+	if (_list.overrideSendImagesAsPhotos == way.sendImagesAsPhotos()
+		|| _sendImagesAsPhotos->isHidden()) {
+		way.setSendImagesAsPhotos(oldWay.sendImagesAsPhotos());
+	}
+	if (way != oldWay) {
+		Core::App().settings().setSendFilesWay(way);
+		Core::App().saveSettingsDelayed();
+	}
+}
+
 void SendFilesBox::send(
 		Api::SendOptions options,
 		bool ctrlShiftEnter) {
@@ -939,19 +955,7 @@ void SendFilesBox::send(
 		return;
 	}
 
-	auto way = _sendWay.current();
-	auto oldWay = Core::App().settings().sendFilesWay();
-	if (_groupFiles->isHidden()) {
-		way.setGroupFiles(oldWay.groupFiles());
-	}
-	if (_list.overrideSendImagesAsPhotos == way.sendImagesAsPhotos()
-		|| _sendImagesAsPhotos->isHidden()) {
-		way.setSendImagesAsPhotos(oldWay.sendImagesAsPhotos());
-	}
-	if (way != oldWay) {
-		Core::App().settings().setSendFilesWay(way);
-		Core::App().saveSettingsDelayed();
-	}
+	saveSendWaySettings();
 
 	for (auto &block : _blocks) {
 		block.applyAlbumOrder();
@@ -963,7 +967,7 @@ void SendFilesBox::send(
 			: TextWithTags();
 		_confirmedCallback(
 			std::move(_list),
-			way,
+			_sendWay.current(),
 			std::move(caption),
 			options,
 			ctrlShiftEnter);
diff --git a/Telegram/SourceFiles/boxes/send_files_box.h b/Telegram/SourceFiles/boxes/send_files_box.h
index 78f4c36247..f85cb43b24 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.h
+++ b/Telegram/SourceFiles/boxes/send_files_box.h
@@ -135,6 +135,7 @@ private:
 	void sendSilent();
 	void sendScheduled();
 	void captionResized();
+	void saveSendWaySettings();
 
 	void setupDragArea();
 	void refreshTitleText();