[Pkg-owncloud-commits] [owncloud-client] 64/121: SocketAPI: Use different pipe name #4977 (#4997)
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Jul 28 15:31:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit 86fd982b0076390d720a4344f2b4b4dfeea1ba03
Author: ckamm <mail at ckamm.de>
Date: Mon Jun 27 15:13:08 2016 +0200
SocketAPI: Use different pipe name #4977 (#4997)
Named pipe names that contain backslashes sometimes lead to problems.
---
shell_integration/windows/OCUtil/CommunicationSocket.cpp | 2 +-
src/gui/socketapi.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/shell_integration/windows/OCUtil/CommunicationSocket.cpp b/shell_integration/windows/OCUtil/CommunicationSocket.cpp
index e37487b..5b419f7 100644
--- a/shell_integration/windows/OCUtil/CommunicationSocket.cpp
+++ b/shell_integration/windows/OCUtil/CommunicationSocket.cpp
@@ -45,7 +45,7 @@ std::wstring getUserName() {
std::wstring CommunicationSocket::DefaultPipePath()
{
auto pipename = std::wstring(L"\\\\.\\pipe\\");
- pipename += L"ownCloud\\";
+ pipename += L"ownCloud-";
pipename += getUserName();
return pipename;
}
diff --git a/src/gui/socketapi.cpp b/src/gui/socketapi.cpp
index 47ecb85..a887455 100644
--- a/src/gui/socketapi.cpp
+++ b/src/gui/socketapi.cpp
@@ -74,7 +74,7 @@ SocketApi::SocketApi(QObject* parent)
if (Utility::isWindows()) {
socketPath = QLatin1String("\\\\.\\pipe\\")
- + QLatin1String("ownCloud") + '\\'
+ + QLatin1String("ownCloud-")
+ QString::fromLocal8Bit(qgetenv("USERNAME"));
// TODO: once the windows extension supports multiple
// client connections, switch back to the theme name
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list