diff --git a/src/backend/dbus-interface/kywirelessnetresource.cpp b/src/backend/dbus-interface/kywirelessnetresource.cpp
index 7503e9d3..65a5d4e7 100644
--- a/src/backend/dbus-interface/kywirelessnetresource.cpp
+++ b/src/backend/dbus-interface/kywirelessnetresource.cpp
@@ -268,11 +268,15 @@ void KyWirelessNetResource::getDeviceByUuid(const QString uuid, QString &deviceN
     NetworkManager::ActiveConnection::Ptr activeConnectionPtr = m_networkResourceInstance->getActiveConnect(uuid);
     if (!activeConnectionPtr.isNull()) {
         QStringList interfaces = activeConnectionPtr->devices();
-        QString ifaceUni = interfaces.at(0);
-        NetworkManager::Device:: Ptr devicePtr =
+        if (interfaces.size() > 0) {
+            QString ifaceUni = interfaces.at(0);
+            NetworkManager::Device:: Ptr devicePtr =
                     m_networkResourceInstance->findDeviceUni(ifaceUni);
-        deviceName = devicePtr->interfaceName();
-        return;
+            deviceName = devicePtr->interfaceName();
+            return;
+        } else {
+            qDebug() << LOG_FLAG << "get device of active connection failed.";
+        }
     }
 
     NetworkManager::Connection::Ptr connectPtr = m_networkResourceInstance->getConnect(uuid);
@@ -407,7 +411,7 @@ void KyWirelessNetResource::onWifiNetworkPropertyChange(NetworkManager::Wireless
         QList<KyWirelessNetItem>::iterator iter = m_WifiNetworkList[devIface].begin();
          while (iter != m_WifiNetworkList[devIface].end()) {
              if (iter->m_NetSsid == net->ssid()) {
-                 qDebug()<< LOG_FLAG <<"recive properity changed signal, sender is" << iter->m_NetSsid;
+//                 qDebug()<< LOG_FLAG <<"recive properity changed signal, sender is" << iter->m_NetSsid;
                  if (iter->m_signalStrength != net->signalStrength()) {
                      iter->m_signalStrength = net->signalStrength();
                      emit signalStrengthChange(devIface, net->ssid(), iter->m_signalStrength);
diff --git a/src/frontend/tab-pages/lanpage.cpp b/src/frontend/tab-pages/lanpage.cpp
index e19897ab..8ebd4ee4 100644
--- a/src/frontend/tab-pages/lanpage.cpp
+++ b/src/frontend/tab-pages/lanpage.cpp
@@ -171,7 +171,8 @@ void LanPage::onSwithGsettingsChanged(const QString &key)
 
 void LanPage::onLanSwitchClicked()
 {
-    qDebug()<<"[LanPage] On lan switch button clicked! Status:" <<m_netSwitch->getSwitchStatus();
+    qDebug()<<"[LanPage] On lan switch button clicked! Status:" <<m_netSwitch->getSwitchStatus()
+            <<"devices count:"<<m_devList.count();
 
     if (m_devList.count() == 0) {
         this->showDesktopNotify(tr("No ethernet device avaliable"));
@@ -184,16 +185,6 @@ void LanPage::onLanSwitchClicked()
             m_switchGsettings->set(WIRED_SWITCH,false);
         }
     }
-
-//    if (m_netSwitch->getSwitchStatus()) {
-//        if (m_devList.count() > 0) {
-//            m_switchGsettings->set(WIRED_SWITCH, true);
-//        } else {
-//            this->showDesktopNotify(tr("No ethernet device avaliable"));
-//        }
-//    } else {
-//        m_switchGsettings->set(WIRED_SWITCH, false);
-//    }
 }
 
 void LanPage::getEnabledDevice(QStringList &enableDeviceList)
diff --git a/src/frontend/tab-pages/wlanpage.cpp b/src/frontend/tab-pages/wlanpage.cpp
index 989ff3df..45e8011a 100644
--- a/src/frontend/tab-pages/wlanpage.cpp
+++ b/src/frontend/tab-pages/wlanpage.cpp
@@ -538,6 +538,8 @@ void WlanPage::updateWlanListItem(QString ssid)
         if (p_listWidgetItem) {
             WlanListItem *p_wlanItem = (WlanListItem *)m_inactivatedNetListWidget->itemWidget(p_listWidgetItem);
             p_wlanItem->updateWirelessNetItem(wirelessNetItem);
+            p_wlanItem->updateConnectState(Deactivated);
+            emit this->wlanConnectChanged(Deactivated);
         }
     }
 
diff --git a/src/frontend/tools/switchbutton.cpp b/src/frontend/tools/switchbutton.cpp
index 357da9e7..003dd884 100644
--- a/src/frontend/tools/switchbutton.cpp
+++ b/src/frontend/tools/switchbutton.cpp
@@ -86,9 +86,11 @@ void SwitchButton::startAnimation() { //滑动按钮动作播放
 /* 按钮按下处理 */
 void SwitchButton::mousePressEvent(QMouseEvent *event) {
     Q_UNUSED(event);
-    if (!m_enabled)
-        return QWidget::mousePressEvent(event);
-    m_bIsOn = !m_bIsOn;
+//    if (!m_enabled)
+//        return QWidget::mousePressEvent(event);
+    if (m_enabled) {
+        m_bIsOn = !m_bIsOn;
+    }
 
     Q_EMIT clicked(m_bIsOn);