[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=4c84499

The following commit has been merged in the master branch:
commit 4c84499e6a93a631debb8145581f2ad63e7670d2
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Thu Dec 17 07:44:29 2015 -0800

    Don't addLink twice for the same link
---
 core/backends/lan/lanlinkprovider.cpp | 3 +--
 core/device.cpp                       | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
index aab269c..e16ce01 100644
--- a/core/backends/lan/lanlinkprovider.cpp
+++ b/core/backends/lan/lanlinkprovider.cpp
@@ -454,10 +454,9 @@ void LanLinkProvider::addLink(const QString& deviceId, QSslSocket* socket, Netwo
             Q_ASSERT(mPairingHandlers.contains(deviceId));
             mPairingHandlers[deviceId]->setDeviceLink(deviceLink);
         }
+        Q_EMIT onConnectionReceived(*receivedPackage, deviceLink);
     }
 
-    Q_EMIT onConnectionReceived(*receivedPackage, deviceLink);
-
 }
 
 LanPairingHandler* LanLinkProvider::createPairingHandler(DeviceLink* link)
diff --git a/core/device.cpp b/core/device.cpp
index 1074c03..3bb7c66 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -246,6 +246,8 @@ void Device::addLink(const NetworkPackage& identityPackage, DeviceLink* link)
 {
     //qCDebug(KDECONNECT_CORE) << "Adding link to" << id() << "via" << link->provider();
 
+    Q_ASSERT(!m_deviceLinks.contains(link));
+
     m_protocolVersion = identityPackage.get<int>("protocolVersion", -1);
     if (m_protocolVersion != NetworkPackage::ProtocolVersion) {
         qCWarning(KDECONNECT_CORE) << m_deviceName << "- warning, device uses a different protocol version" << m_protocolVersion << "expected" << NetworkPackage::ProtocolVersion;

-- 
kdeconnect packaging