summaryrefslogtreecommitdiffstats
path: root/common/resourceaccess.cpp
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2016-02-13 19:10:18 +0100
committerChristian Mollekopf <chrigi_1@fastmail.fm>2016-02-13 19:10:18 +0100
commit878c1ad8d0700127cfc80c091abf8d72ed375637 (patch)
tree1bc33fbe523d4db6fb1a530d2b20bad0786e0f0f /common/resourceaccess.cpp
parenta9a0f53af2138cf259daa2dfee62cb3d785d00aa (diff)
downloadsink-878c1ad8d0700127cfc80c091abf8d72ed375637.tar.gz
sink-878c1ad8d0700127cfc80c091abf8d72ed375637.zip
Fixed condition with reusing sockets in resourceaccess
Diffstat (limited to 'common/resourceaccess.cpp')
-rw-r--r--common/resourceaccess.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/common/resourceaccess.cpp b/common/resourceaccess.cpp
index 555d807..0716ae2 100644
--- a/common/resourceaccess.cpp
+++ b/common/resourceaccess.cpp
@@ -164,8 +164,9 @@ KAsync::Job<QSharedPointer<QLocalSocket> > ResourceAccess::connectToServer(const
164 164
165KAsync::Job<void> ResourceAccess::Private::tryToConnect() 165KAsync::Job<void> ResourceAccess::Private::tryToConnect()
166{ 166{
167 auto counter = QSharedPointer<int>::create(); 167 //We may have a socket from the last connection leftover
168 *counter = 0; 168 socket.reset();
169 auto counter = QSharedPointer<int>::create(0);
169 return KAsync::dowhile([this]() -> bool { 170 return KAsync::dowhile([this]() -> bool {
170 return !socket; 171 return !socket;
171 }, 172 },
@@ -456,6 +457,7 @@ void ResourceAccess::processPendingCommandQueue()
456void ResourceAccess::connected() 457void ResourceAccess::connected()
457{ 458{
458 if (!isReady()) { 459 if (!isReady()) {
460 Trace() << "Connected but not ready?";
459 return; 461 return;
460 } 462 }
461 463