From fcdf87bb112d04edc71aa8c41f85b4855ae6214a Mon Sep 17 00:00:00 2001
From: jzxc95 <907297917@qq.com>
Date: Fri, 24 Sep 2021 09:38:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=AF=8F=E6=AC=A1=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E6=88=96=E6=96=AD=E5=BC=80=E8=BF=9E=E6=8E=A5=E4=BC=9A=E5=A4=9A?=
 =?UTF-8?q?=E5=87=BA=E6=96=B0=E5=A2=9E=E6=88=96=E5=87=8F=E5=B0=91wifi?=
 =?UTF-8?q?=E7=9A=84=E4=BF=A1=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/tab-pages/wlanpage.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/frontend/tab-pages/wlanpage.cpp b/src/frontend/tab-pages/wlanpage.cpp
index 72a99922..aea44a82 100644
--- a/src/frontend/tab-pages/wlanpage.cpp
+++ b/src/frontend/tab-pages/wlanpage.cpp
@@ -106,7 +106,14 @@ void WlanPage::initWlanUI()
 void WlanPage::initConnections()
 {
     connect(m_resource, &KyWirelessNetResource::wifiNetworkAdd, this, &WlanPage::onWlanAdded);
+    connect(m_resource, &KyWirelessNetResource::wifiNetworkAdd, this, [=](QString interface, KyWirelessNetItem &item){
+        //for dbus
+        QStringList info;
+        info <<item.m_NetSsid<<QString::number(item.m_signalStrength)<<item.m_secuType;
+        emit wlanAdd(interface, info);
+    });
     connect(m_resource, &KyWirelessNetResource::wifiNetworkRemove, this, &WlanPage::onWlanRemoved);
+    connect(m_resource, &KyWirelessNetResource::wifiNetworkRemove, this, &WlanPage::wlanRemove);
     connect(m_resource, &KyWirelessNetResource::signalStrengthChange, this, &WlanPage::signalStrengthChange);
     connect(m_resource, &KyWirelessNetResource::secuTypeChange, this, &WlanPage::secuTypeChange);
 
@@ -289,12 +296,6 @@ void WlanPage::getAllWlan()
 
 void WlanPage::onWlanAdded(QString interface, KyWirelessNetItem &item)
 {
-    //for dbus
-    QStringList info;
-    info <<item.m_NetSsid<<QString::number(item.m_signalStrength)<<item.m_secuType;
-    emit wlanAdd(interface, info);
-
-
     qDebug() << "A Wlan Added! interface = " << interface << "; ssid = " << item.m_NetSsid << Q_FUNC_INFO <<__LINE__;
     if (interface != m_defaultDevice) {
         qDebug() << "wlan add interface not equal defaultdevice,ignore";
@@ -316,7 +317,6 @@ void WlanPage::onWlanAdded(QString interface, KyWirelessNetItem &item)
 
 void WlanPage::onWlanRemoved(QString interface, QString ssid)
 {
-    emit wlanRemove(interface, ssid);
     if (!m_itemsMap.contains(ssid)) { return; }
     if (m_expandedItem == m_itemsMap.value(ssid)) { m_expandedItem = nullptr; }
     qDebug() << "A Wlan Removed! interface = " << interface << "; ssid = " << ssid << Q_FUNC_INFO <<__LINE__;