[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=52dceac

The following commit has been merged in the master branch:
commit 52dceacd140ca6690a9343f8465dd1b5af2071ce
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Wed Nov 6 18:35:40 2013 +0100

    Trying to fix a crash in LanDeviceLink/SocketLineReader
    
    ReadyRead is emitted more than once, and there is no data the second time
---
 kded/backends/lan/landevicelink.cpp    |  2 ++
 kded/backends/lan/socketlinereader.cpp | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/kded/backends/lan/landevicelink.cpp b/kded/backends/lan/landevicelink.cpp
index b2fef59..706077b 100644
--- a/kded/backends/lan/landevicelink.cpp
+++ b/kded/backends/lan/landevicelink.cpp
@@ -77,6 +77,8 @@ bool LanDeviceLink::sendPackage(NetworkPackage& np)
 void LanDeviceLink::dataReceived()
 {
 
+    if (mSocketLineReader->bytesAvailable() == 0) return;
+
     QByteArray package = mSocketLineReader->readLine();
 
     //qDebug() << "LanDeviceLink dataReceived" << package;
diff --git a/kded/backends/lan/socketlinereader.cpp b/kded/backends/lan/socketlinereader.cpp
index 3d0542f..91ff97e 100644
--- a/kded/backends/lan/socketlinereader.cpp
+++ b/kded/backends/lan/socketlinereader.cpp
@@ -55,14 +55,17 @@ void SocketLineReader::dataReceived()
 
     lastChunk = data.mid(parsedLength);
 
-    if (mPackages.length() > 0) {
-        Q_EMIT readyRead();
-    } else {
-        qDebug() << "Received incomplete chunk of data, waiting for more";
-    }
-
     if (mSocket->bytesAvailable() > 0) {
+
         QMetaObject::invokeMethod(this, "dataReceived", Qt::QueuedConnection);
-    }
 
+    } else {
+
+        if (mPackages.length() > 0) {
+            Q_EMIT readyRead();
+        } else {
+            qDebug() << "Received incomplete chunk of data, waiting for more";
+        }
+
+    }
 }

-- 
kdeconnect packaging