From 878c1ad8d0700127cfc80c091abf8d72ed375637 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Sat, 13 Feb 2016 19:10:18 +0100
Subject: Fixed condition with reusing sockets in resourceaccess

---
 common/resourceaccess.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'common')

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
 
 KAsync::Job<void> ResourceAccess::Private::tryToConnect()
 {
-    auto counter = QSharedPointer<int>::create();
-    *counter = 0;
+    //We may have a socket from the last connection leftover
+    socket.reset();
+    auto counter = QSharedPointer<int>::create(0);
     return KAsync::dowhile([this]() -> bool {
         return !socket;
     },
@@ -456,6 +457,7 @@ void ResourceAccess::processPendingCommandQueue()
 void ResourceAccess::connected()
 {
     if (!isReady()) {
+        Trace() << "Connected but not ready?";
         return;
     }
 
-- 
cgit v1.2.3