From bbfd07688d5ce79fd7c097d9fdee87cb7d66ffdf Mon Sep 17 00:00:00 2001 From: DashieTM Date: Sat, 11 Nov 2023 23:00:38 +0100 Subject: [PATCH] fix: Execute connect function with wifi connect button --- src/components/wifi/wifiEntry.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/components/wifi/wifiEntry.rs b/src/components/wifi/wifiEntry.rs index 91d1422..f827ec2 100644 --- a/src/components/wifi/wifiEntry.rs +++ b/src/components/wifi/wifiEntry.rs @@ -177,6 +177,7 @@ pub fn click_new_network(entry: Arc) { let result = Arc::new(AtomicBool::new(false)); let result_ref = result.clone(); + let result_ref_button = result.clone(); let entryImp = entry.imp(); let popupImp = entryImp.resetWifiPopup.imp(); popupImp @@ -190,8 +191,13 @@ pub fn click_new_network(entry: Arc) { })); popupImp .resetPopupButton - .connect_clicked(clone!(@weak popupImp => move |_| { - popupImp.resetPopupEntry.activate(); + .connect_clicked(clone!(@weak entry as origEntry,@weak entryImp, @weak popupImp => move |_| { + let entry = entryImp.resetWifiPopup.imp().resetPopupEntry.text().to_string(); + result_ref_button.store( + connect_new_network(origEntry, entryImp.accessPoint.clone().take(), entry), + std::sync::atomic::Ordering::SeqCst, + ); + entryImp.resetWifiPopup.popdown(); })); entryImp.resetWifiPopup.popup(); println!(