summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2018-03-18 12:32:30 +0100
committerChristian Mollekopf <chrigi_1@fastmail.fm>2018-03-18 12:32:30 +0100
commit2c2a4f6b98150078a6e1a1312e6e86a7cc448a87 (patch)
treea944c0b9afd1a3203984f311199d8d61f4c901c8
parent93998254aa3c0764aa1315480ac97a8a04574ab8 (diff)
downloadsink-2c2a4f6b98150078a6e1a1312e6e86a7cc448a87.tar.gz
sink-2c2a4f6b98150078a6e1a1312e6e86a7cc448a87.zip
Use connectToServer instead of setServerName + open
-rw-r--r--common/resourceaccess.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/common/resourceaccess.cpp b/common/resourceaccess.cpp
index 85dda6d..fe4293d 100644
--- a/common/resourceaccess.cpp
+++ b/common/resourceaccess.cpp
@@ -151,7 +151,6 @@ KAsync::Job<QSharedPointer<QLocalSocket>> ResourceAccess::connectToServer(const
151{ 151{
152 auto s = QSharedPointer<QLocalSocket>{new QLocalSocket, &QObject::deleteLater}; 152 auto s = QSharedPointer<QLocalSocket>{new QLocalSocket, &QObject::deleteLater};
153 return KAsync::start<QSharedPointer<QLocalSocket>>([identifier, s](KAsync::Future<QSharedPointer<QLocalSocket>> &future) { 153 return KAsync::start<QSharedPointer<QLocalSocket>>([identifier, s](KAsync::Future<QSharedPointer<QLocalSocket>> &future) {
154 s->setServerName(identifier);
155 auto context = new QObject; 154 auto context = new QObject;
156 QObject::connect(s.data(), &QLocalSocket::connected, context, [&future, &s, context]() { 155 QObject::connect(s.data(), &QLocalSocket::connected, context, [&future, &s, context]() {
157 Q_ASSERT(s); 156 Q_ASSERT(s);
@@ -163,7 +162,7 @@ KAsync::Job<QSharedPointer<QLocalSocket>> ResourceAccess::connectToServer(const
163 delete context; 162 delete context;
164 future.setError(-1, "Failed to connect to server."); 163 future.setError(-1, "Failed to connect to server.");
165 }); 164 });
166 s->open(); 165 s->connectToServer(identifier);
167 }); 166 });
168} 167}
169 168