[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=79a8103

The following commit has been merged in the master branch:
commit 79a81031208cb76c5b5c809b154dd48f6976e9d7
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Thu Dec 10 17:11:55 2015 -0800

    Added some asserts
---
 core/backends/lan/lanlinkprovider.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
index 07b39af..347b7e1 100644
--- a/core/backends/lan/lanlinkprovider.cpp
+++ b/core/backends/lan/lanlinkprovider.cpp
@@ -393,9 +393,11 @@ void LanLinkProvider::deviceLinkDestroyed(QObject* destroyedDeviceLink)
 {
     //qCDebug(KDECONNECT_CORE) << "deviceLinkDestroyed";
     const QString id = destroyedDeviceLink->property("deviceId").toString();
-    QMap< QString, DeviceLink* >::iterator oldLinkIterator = mLinks.find(id);
-    if (oldLinkIterator != mLinks.end() && oldLinkIterator.value() == destroyedDeviceLink) {
-        mLinks.erase(oldLinkIterator);
+    Q_ASSERT(mLinks.key(static_cast<LanDeviceLink*>(destroyedDeviceLink)) == id);
+    QMap< QString, LanDeviceLink* >::iterator linkIterator = mLinks.find(id);
+    if (linkIterator != mLinks.end()) {
+        Q_ASSERT(linkIterator.value() == destroyedDeviceLink);
+        mLinks.erase(linkIterator);
     }
 
 }
@@ -436,7 +438,7 @@ void LanLinkProvider::addLink(const QString& deviceId, QSslSocket* socket, Netwo
     // Socket disconnection will now be handled by LanDeviceLink
     disconnect(socket, SIGNAL(disconnected()), socket, SLOT(deleteLater()));
 
-    DeviceLink* deviceLink;
+    LanDeviceLink* deviceLink;
     //Do we have a link for this device already?
     QMap< QString, LanDeviceLink* >::iterator linkIterator = mLinks.find(deviceLink->deviceId());
     if (linkIterator != mLinks.end()) {

-- 
kdeconnect packaging