[SCM] kdeconnect packaging branch, master, updated. upstream/1.0.1-206-gf661872

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit f765e9c0a8fe11601d0b874453467d9b5ab6db54
Author: Aleix Pol <aleixpol at kde.org>
Date:   Sun Aug 21 13:21:40 2016 +0200

    Actually compare the old plugin map
    
    We were comparing to the result after removing all the actually used
    plugins
---
 core/device.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/device.cpp b/core/device.cpp
index fb89cee..a803bc1 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -94,7 +94,7 @@ QStringList Device::loadedPlugins() const
 
 void Device::reloadPlugins()
 {
-    QHash<QString, KdeConnectPlugin*> newPluginMap;
+    QHash<QString, KdeConnectPlugin*> newPluginMap, oldPluginMap = m_plugins;
     QMultiMap<QString, KdeConnectPlugin*> newPluginsByIncomingCapability;
 
     if (isTrusted() && isReachable()) { //Do not load any plugin for unpaired devices, nor useless loading them for unreachable devices
@@ -124,7 +124,7 @@ void Device::reloadPlugins()
         }
     }
 
-    const bool differentPlugins = m_plugins != newPluginMap;
+    const bool differentPlugins = oldPluginMap != newPluginMap;
 
     //Erase all left plugins in the original map (meaning that we don't want
     //them anymore, otherwise they would have been moved to the newPluginMap)

-- 
kdeconnect packaging