Merge PR #3066: SocketRPC: ensure pipe paths match up.

mumble-voip · May 7, 2017 · a6aba12 · a6aba12
2 parents 81b00bf + 3705494
commit a6aba12
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/mumble/SocketRPC.cpp b/src/mumble/SocketRPC.cpp
@@ -272,7 +272,16 @@ bool SocketRPC::send(const QString &basename, const QString &request, const QMap
 #ifdef Q_OS_WIN
 	pipepath = basename;
 #else
-	pipepath = QDir::home().absoluteFilePath(QLatin1String(".") + basename + QLatin1String("Socket"));
+	{
+		QString xdgRuntimePath = QProcessEnvironment::systemEnvironment().value(QLatin1String("XDG_RUNTIME_DIR"));
+		QDir xdgRuntimeDir = QDir(xdgRuntimePath);
+
+		if (! xdgRuntimePath.isNull() && xdgRuntimeDir.exists()) {
+			pipepath = xdgRuntimeDir.absoluteFilePath(basename + QLatin1String("Socket"));
+		} else {
+			pipepath = QDir::home().absoluteFilePath(QLatin1String(".") + basename + QLatin1String("Socket"));
+		}
+	}
 #endif
 
 	QLocalSocket qls;