Merge branch '0622-1-main' into 'main'

Fix bug-61628 wifi输入错误密码连接失败后，删除密码重新输入后点击连接无反应

See merge request kylin-desktop/kylin-nm!54

src/mainwindow.cpp

@@ -2109,8 +2109,12 @@ void MainWindow::getConnListDone(QStringList slist)
             if (! is_stop_check_net_state) {
                 this->is_stop_check_net_state = 1;
                 BackThread *bt = new BackThread();
+//                connect(bt, SIGNAL(connDone(int)), this, SLOT(connWifiDone(int)));
+                connect(bt, &BackThread::connDone, this, [ = ](int res) {
+                    connWifiDone(res);
+                    bt->deleteLater();
+                });
                 bt->execConnWifi(lastAddedConn, objKyDBus->dbusWiFiCardName);
-                connect(bt, SIGNAL(connDone(int)), this, SLOT(connWifiDone(int)));
             }
         }
         oldConnSlist.clear();
@@ -3969,6 +3973,7 @@ void MainWindow::onExternalWifiChange()
 //        //objKyDBus->showDesktopNotify(txt);
 //    }
     if (m_connected_by_self) {
+        is_stop_check_net_state = 0;
         m_connected_by_self = false;
         return;
     }

src/oneconnform.cpp

@@ -896,6 +896,7 @@ void OneConnForm::on_btnConnPWD_clicked()
             passwdFile->close();
 //            cmdStr = "nmcli connection up " + wifiName + " passwd-file " + homePath +"/.config/" + wifiName + ".psk";
         }
+
         mw->is_stop_check_net_state = 1;
         QThread *t = new QThread();
         BackThread *bt = new BackThread();

src/onelancform.cpp

@@ -400,6 +400,7 @@ void OneLancForm::toConnectWiredNetwork()
     if (mw->is_stop_check_net_state == 1) {
         return;
     }
+
     mw->is_stop_check_net_state = 1;
     QThread *t = new QThread();
     BackThread *bt = new BackThread();