Fix auto-selecting album when sending multiple files

3 files changed, 10 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b53face86490..ee781aa7a47b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = telegram-desktop-udf-patched
 	pkgdesc = Telegram Desktop client with several personal patches
 	pkgver = 1.9.8
-	pkgrel = 2
+	pkgrel = 3
 	url = https://desktop.telegram.org/
 	arch = x86_64
 	license = GPL3
@@ -34,7 +34,7 @@ pkgbase = telegram-desktop-udf-patched
 	sha512sums = e88fa96024efc6176c818d0a46684e0ee1fb3a7bdadb323ad3b29f736209c80b6c31b135cf84389e7e2bbd614e57b241e4437c94b6fd114e73cfc418bf130015
 	sha512sums = 4a7e9de924bbf32fb4cd24ffa2764bcf49e0540bba649829b180da20a62810d4a21ebf11529d4eca22c9ceaa93b434ca3fbfd0b636795f8109ea4e1eddbff8f3
 	sha512sums = b4eeeb4b2801f3edcc7423f28403b1dfabd3f3869425e4f102a2a4554bde93e63bd73d2d4dbf3e5748ce831b570e441d3917f532fc5cceac1ee5e8fd0832cb30
-	sha512sums = 650a2a2568cacd2775979614c06c90a4c505207246eb229bbf4fccd8e9fc2540093eaa5bd748e3801c1e1b43beb89b19674c27c5f400d451475b0ee068b04ca2
+	sha512sums = 1fb1e4d9dcf0d54f98b2cf47a3a0cc6e6eed649617efab0e5631d9760b42eb85c7c421ba659656405f0f1d1087a80090baebb9f5f1154f4d0da9493dfa4a13c3
 
 pkgname = telegram-desktop-udf-patched
 
diff --git a/PKGBUILD b/PKGBUILD
index 79357a66477c..72982554a094 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
 
 pkgname=telegram-desktop-udf-patched
 pkgver=1.9.8
-pkgrel=2
+pkgrel=3
 pkgdesc='Telegram Desktop client with several personal patches'
 arch=('x86_64')
 url="https://desktop.telegram.org/"
@@ -43,7 +43,7 @@ sha512sums=(
     'e88fa96024efc6176c818d0a46684e0ee1fb3a7bdadb323ad3b29f736209c80b6c31b135cf84389e7e2bbd614e57b241e4437c94b6fd114e73cfc418bf130015'
     '4a7e9de924bbf32fb4cd24ffa2764bcf49e0540bba649829b180da20a62810d4a21ebf11529d4eca22c9ceaa93b434ca3fbfd0b636795f8109ea4e1eddbff8f3'
     'b4eeeb4b2801f3edcc7423f28403b1dfabd3f3869425e4f102a2a4554bde93e63bd73d2d4dbf3e5748ce831b570e441d3917f532fc5cceac1ee5e8fd0832cb30'
-    '650a2a2568cacd2775979614c06c90a4c505207246eb229bbf4fccd8e9fc2540093eaa5bd748e3801c1e1b43beb89b19674c27c5f400d451475b0ee068b04ca2'
+    '1fb1e4d9dcf0d54f98b2cf47a3a0cc6e6eed649617efab0e5631d9760b42eb85c7c421ba659656405f0f1d1087a80090baebb9f5f1154f4d0da9493dfa4a13c3'
 )
 
 prepare() {
@@ -103,4 +103,4 @@ package() {
         install -d "$icon_dir"
         install -m644 "Telegram/Resources/art/icon${icon_size}.png" "$icon_dir/telegram.png"
     done
-}
\ No newline at end of file
+}
diff --git a/always_send_as_photo_or_album.patch b/always_send_as_photo_or_album.patch
index 20009befc3c5..989f99a85a10 100644
--- a/always_send_as_photo_or_album.patch
+++ b/always_send_as_photo_or_album.patch
@@ -2,10 +2,10 @@ Description: Disables loading the previous way media was sent, so it always sele
 photo or album by default.
 
 diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
-index 2f4c45c48..ed9bf4bb6 100644
+index cb9075432..41384abd0 100644
 --- a/Telegram/SourceFiles/boxes/send_files_box.cpp
 +++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
-@@ -1498,14 +1498,6 @@ void SendFilesBox::initSendWay() {
+@@ -1911,15 +1911,7 @@ void SendFilesBox::initSendWay() {
  				? SendFilesWay::Album
  				: SendFilesWay::Photos;
  		}
@@ -17,6 +17,8 @@ index 2f4c45c48..ed9bf4bb6 100644
 -				? SendFilesWay::Album
 -				: SendFilesWay::Photos;
 -		}
- 		return (_list.albumIsPossible && !_albumPhotosCount)
+-		return (_list.albumIsPossible && !_albumPhotosCount)
++		return _list.albumIsPossible
  			? SendFilesWay::Album
  			: SendFilesWay::Photos;
+ 	}();