using close event from slint to force exit the app

Author: TuEmb

src/event_handler/debug.rs

@@ -1,7 +1,7 @@
-use std::{collections::HashMap, process::exit, rc::Rc, time::Duration};
+use std::{collections::HashMap, rc::Rc, time::Duration};
 
 use crate::slint_generatedAppWindow::{raw_can, AppWindow};
-use slint::{ComponentHandle, Model, SharedString, VecModel, Weak};
+use slint::{Model, SharedString, VecModel, Weak};
 use socketcan::{CanSocket, EmbeddedFrame, Frame, Socket};
 pub struct DebugHandler<'a> {
     #[cfg(target_os = "linux")]
@@ -14,14 +14,6 @@ pub struct DebugHandler<'a> {
 }
 
 impl<'a> DebugHandler<'a> {
-    pub fn check_to_kill_thread(&self) {
-        let _ = self.ui_handle.upgrade_in_event_loop(move |ui| {
-            if !ui.window().is_visible() {
-                exit(1);
-            }
-        });
-    }
-
     pub fn run(&mut self) {
         let can_socket = CanSocket::open(self.iface).unwrap();
         if let Ok(frame) = can_socket.read_frame() {

src/event_handler/init.rs

@@ -1,10 +1,10 @@
 use crate::slint_generatedAppWindow::{socket_info, AppWindow};
 #[cfg(target_os = "windows")]
 use pcan_basic::hw::attached_channels as available_interfaces;
-use slint::{ComponentHandle, ModelRc, SharedString, VecModel, Weak};
+use slint::{ModelRc, SharedString, VecModel, Weak};
 #[cfg(target_os = "linux")]
 use socketcan::available_interfaces;
-use std::{process::exit, time::Duration};
+use std::time::Duration;
 pub struct Init<'a> {
     pub ui_handle: &'a Weak<AppWindow>,
 }
@@ -95,11 +95,6 @@ impl<'a> Init<'a> {
                     });
                 }
             };
-            let _ = self.ui_handle.upgrade_in_event_loop(move |ui| {
-                if !ui.window().is_visible() {
-                    exit(1);
-                }
-            });
             std::thread::sleep(Duration::from_millis(50));
         }
     }

src/event_handler/view.rs

@@ -2,13 +2,12 @@ use can_dbc::DBC;
 use chrono::Utc;
 #[cfg(target_os = "windows")]
 use pcan_basic::socket::usb::UsbCanSocket;
-use slint::{ComponentHandle, Model, ModelRc, SharedString, VecModel, Weak};
+use slint::{Model, ModelRc, SharedString, VecModel, Weak};
 #[cfg(target_os = "linux")]
 use socketcan::{CanInterface, CanSocket, EmbeddedFrame, Frame, Socket};
 use std::{
     collections::HashMap,
     fmt::Write,
-    process::exit,
     rc::Rc,
     sync::{mpsc::Receiver, Arc, Mutex},
     thread::sleep,
@@ -30,13 +29,6 @@ static mut NEW_DBC_CHECK: bool = false;
 use super::{EVEN_COLOR, ODD_COLOR};
 
 impl<'a> ViewHandler<'a> {
-    pub fn check_to_kill_thread(&self) {
-        let _ = self.ui_handle.upgrade_in_event_loop(move |ui| {
-            if !ui.window().is_visible() {
-                exit(1);
-            }
-        });
-    }
     pub fn process_can_messages(&mut self) {
         if let Ok(dbc) = self.mspc_rx.lock().unwrap().try_recv() {
             #[cfg(target_os = "linux")]
@@ -76,7 +68,6 @@ impl<'a> ViewHandler<'a> {
         let mut start_bus_load = Instant::now();
         let mut total_bits = 0;
         loop {
-            self.check_to_kill_thread();
             let bus_state = match can_if.state().unwrap().unwrap() {
                 socketcan::nl::CanState::ErrorActive => "ERR_ACTIVE",
                 socketcan::nl::CanState::ErrorWarning => "ERR_WARNING",

src/main.rs

@@ -118,7 +118,6 @@ async fn main() -> io::Result<()> {
             };
             loop {
                 can_handler.run();
-                can_handler.check_to_kill_thread();
             }
         }
     });
@@ -144,6 +143,12 @@ async fn main() -> io::Result<()> {
         };
         packet_filter.process_filter();
     });
+
+    ui.window().on_close_requested(|| {
+        println!("Closing the application...");
+        std::process::exit(0);
+    });
+
     ui.run().unwrap();
     Ok(())
 }