FOSS/AyuGramDesktop
1
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2026-07-25 06:54:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v4.14.1' into dev

Browse Source 
# Conflicts:
#	Telegram/Resources/winrc/Telegram.rc
#	Telegram/Resources/winrc/Updater.rc
#	Telegram/SourceFiles/core/version.h
#	Telegram/SourceFiles/data/data_stories.cpp
#	Telegram/SourceFiles/history/history_item.cpp
#	Telegram/SourceFiles/main/main_session.cpp
#	Telegram/lib_ui
This commit is contained in:
ZavaruKitsu
2024-01-02 01:02:43 +03:00
parent 3948341d6a 0ae537478f
commit 7cdbbc318a
200 changed files with 3475 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Telegram/SourceFiles/storage/localstorage.cpp
+3 -2
View File
@@ -589,8 +589,9 @@ void writeAutoupdatePrefix(const QString &prefix) {
QString readAutoupdatePrefix() {
Expects(!Core::UpdaterDisabled());
static const auto RegExp = QRegularExpression("/+$");
auto result = readAutoupdatePrefixRaw();
return result.replace(QRegularExpression("/+$"), QString());
return result.replace(RegExp, QString());
}
void writeBackground(const Data::WallPaper &paper, const QImage &image) {
@@ -623,7 +624,7 @@ void writeBackground(const Data::WallPaper &paper, const QImage &image) {
dst = dst.subspan(sizeof(qint32));
bytes::copy(dst, bytes::object_as_span(&height));
dst = dst.subspan(sizeof(qint32));
const auto src = bytes::make_span(image.constBits(), srcsize);
const auto src = bytes::make_span(copy.constBits(), srcsize);
if (srcsize == dstsize) {
bytes::copy(dst, src);
} else {