FOSS/AyuGramDesktop
1
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2026-07-26 15:32:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge v4.14.13

Browse Source 
# Conflicts:
#	Telegram/Resources/winrc/Telegram.rc
#	Telegram/Resources/winrc/Updater.rc
#	Telegram/SourceFiles/core/version.h
#	Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
#	Telegram/SourceFiles/history/view/media/history_view_photo.cpp
#	Telegram/SourceFiles/history/view/reactions/history_view_reactions_selector.cpp
#	Telegram/SourceFiles/mainwidget.cpp
#	Telegram/lib_ui
This commit is contained in:
ZavaruKitsu
2024-02-03 23:20:50 +03:00
parent e47ff9fd34 2f0b50cb37
commit 77d52bb1b3
251 changed files with 6957 additions and 2361 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Telegram/SourceFiles/platform/linux/specific_linux.cpp
+7 -3
View File
@@ -454,9 +454,13 @@ QString SingleInstanceLocalServerName(const QString &hash) {
+ '.'
+ hash;
}
return hash + '-' + cGUIDStr();
return hash + '-' + QCoreApplication::applicationName();
#else // Q_OS_LINUX && Qt >= 6.2.0
return QDir::tempPath() + '/' + hash + '-' + cGUIDStr();
return QDir::tempPath()
+ '/'
+ hash
+ '-'
+ QCoreApplication::applicationName();
#endif // !Q_OS_LINUX || Qt < 6.2.0
}
@@ -648,7 +652,7 @@ void start() {
Webview::WebKitGTK::SetSocketPath(u"%1/%2-%3-webview-%4"_q.arg(
QDir::tempPath(),
h,
cGUIDStr(),
QCoreApplication::applicationName(),
u"%1"_q).toStdString());
InstallLauncher();