Shorten socket paths on Linux

This commit is contained in:
Ilya Fedin 2024-01-29 11:43:02 +04:00 committed by John Preston
parent 852196a013
commit 5d33290218
2 changed files with 8 additions and 4 deletions

View file

@ -454,9 +454,13 @@ QString SingleInstanceLocalServerName(const QString &hash) {
+ '.' + '.'
+ hash; + hash;
} }
return hash + '-' + cGUIDStr(); return hash + '-' + QCoreApplication::applicationName();
#else // Q_OS_LINUX && Qt >= 6.2.0 #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 #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( Webview::WebKitGTK::SetSocketPath(u"%1/%2-%3-webview-%4"_q.arg(
QDir::tempPath(), QDir::tempPath(),
h, h,
cGUIDStr(), QCoreApplication::applicationName(),
u"%1"_q).toStdString()); u"%1"_q).toStdString());
InstallLauncher(); InstallLauncher();

@ -1 +1 @@
Subproject commit 3d5830556b088cb74c0e60f2371169dde717d3fb Subproject commit 75cc4c04d28a09172b1df596913c09161aaede35