summarylogtreecommitdiffstats
path: root/always_send_as_photo_or_album.patch
diff options
context:
space:
mode:
authorudf2020-08-03 21:15:04 +0200
committerudf2020-08-03 21:15:04 +0200
commit957a7bce0b0655239f721368cba16c390f0c3365 (patch)
treeffbafe9834d338643062813d1e07c938e31191bf /always_send_as_photo_or_album.patch
parentfac515119e4f3ec411da075adb1e2198769d6859 (diff)
downloadaur-957a7bce0b0655239f721368cba16c390f0c3365.tar.gz
Update to 2.2.0
Diffstat (limited to 'always_send_as_photo_or_album.patch')
-rw-r--r--always_send_as_photo_or_album.patch8
1 files changed, 3 insertions, 5 deletions
diff --git a/always_send_as_photo_or_album.patch b/always_send_as_photo_or_album.patch
index 989f99a85a10..994b3fd2ad71 100644
--- a/always_send_as_photo_or_album.patch
+++ b/always_send_as_photo_or_album.patch
@@ -2,14 +2,13 @@ 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 cb9075432..41384abd0 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
-@@ -1911,15 +1911,7 @@ void SendFilesBox::initSendWay() {
+@@ -1947,14 +1947,6 @@
? SendFilesWay::Album
: SendFilesWay::Photos;
}
-- const auto way = _controller->session().settings().sendFilesWay();
+- const auto way = Core::App().settings().sendFilesWay();
- if (way == SendFilesWay::Files) {
- return way;
- } else if (way == SendFilesWay::Album) {
@@ -17,8 +16,7 @@ index cb9075432..41384abd0 100644
- ? SendFilesWay::Album
- : SendFilesWay::Photos;
- }
-- return (_list.albumIsPossible && !_albumPhotosCount)
-+ return _list.albumIsPossible
+ return (_list.albumIsPossible && !_albumPhotosCount)
? SendFilesWay::Album
: SendFilesWay::Photos;
}();