is_log_level_equal function

Author: ssrlive

Cargo.toml

@@ -15,7 +15,7 @@ overtls = { version = "0.3.6" }
 qrcode = "0.14.1"
 rfd = { version = "0.15.4", default-features = false, features = ["xdg-portal", "tokio"] }
 rqrr = "0.10.0"
-run-as = { version = "1.2.1", default-features = false }
+run-as = { version = "1.2.2", default-features = false }
 screenshot = { version = "0.0.7", git = "https://github.com/ssrlive/screenshot-rs.git", rev = "36f877f" }
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.143"

src/main.rs

@@ -645,6 +645,12 @@ async fn main() -> Result<(), BoxError> {
         // Deal with settings dialog results
         while let Ok(new_settings) = settings_rx.try_recv() {
             let tun2proxy_enable = new_settings.tun2proxy_enable.unwrap_or_default();
+            let equal_log_level = state
+                .borrow()
+                .system_settings
+                .as_ref()
+                .map(|s| s.is_log_level_equal(&new_settings))
+                .unwrap_or(false);
             state.borrow_mut().system_settings = Some(new_settings);
             if tun2proxy_enable && !run_as::is_elevated() {
                 if let Ok(status) = core::restart_as_admin() {
@@ -657,8 +663,18 @@ async fn main() -> Result<(), BoxError> {
                         .set_level(rfd::MessageLevel::Error)
                         .show();
                 }
+            } else if !equal_log_level {
+                rfd::MessageDialog::new()
+                    .set_title("Restart Required")
+                    .set_description("Log level changes will take effect after restart.")
+                    .set_level(rfd::MessageLevel::Info)
+                    .show();
+                save_final_app_state(&state, &remote_nodes, &win, &current_node_index)?;
+                if let Err(e) = run_as::restart_self(None, false) {
+                    log::error!("Failed to restart self: {e}");
+                }
+                ::fltk::app::quit();
             }
-            log::info!("Settings updated. Log filter changes will take effect after restart.");
         }
 
         // Handle results from node details dialogs
@@ -725,11 +741,21 @@ async fn main() -> Result<(), BoxError> {
         }
     }
 
-    state.borrow_mut().remote_nodes = remote_nodes.borrow().clone();
-    state.borrow_mut().window.refresh_window(&win);
-    state.borrow_mut().current_node_index = *current_node_index.borrow();
+    fn save_final_app_state(
+        state: &Rc<RefCell<states_manager::AppState>>,
+        remote_nodes: &Rc<RefCell<Vec<OverTlsNode>>>,
+        win: &Window,
+        current_node_index: &Rc<RefCell<Option<usize>>>,
+    ) -> std::io::Result<()> {
+        state.borrow_mut().remote_nodes = remote_nodes.borrow().clone();
+        state.borrow_mut().window.refresh_window(win);
+        state.borrow_mut().current_node_index = *current_node_index.borrow();
+
+        states_manager::save_app_state(&state.borrow())?;
+        Ok(())
+    }
 
-    states_manager::save_app_state(&state.borrow())?;
+    save_final_app_state(&state, &remote_nodes, &win, &current_node_index)?;
 
     if let Err(e) = stop_running_node(&running_token, &running_handle) {
         log::debug!("Failed to stop running node: {e}");

src/states_manager.rs

@@ -96,9 +96,6 @@ impl Default for SystemSettings {
 pub struct AppState {
     pub window: WindowState,
 
-    #[serde(skip_serializing_if = "Option::is_none", default)]
-    pub working_node: Option<OverTlsNode>,
-
     #[serde(skip_serializing_if = "Option::is_none", default)]
     pub current_node_index: Option<usize>,
 
@@ -215,4 +212,14 @@ impl SystemSettings {
             default_level,
         }
     }
+
+    pub fn is_log_level_equal(&self, other: &SystemSettings) -> bool {
+        self.rustls_log_level == other.rustls_log_level
+            && self.tokio_tungstenite_log_level == other.tokio_tungstenite_log_level
+            && self.tungstenite_log_level == other.tungstenite_log_level
+            && self.ipstack_log_level == other.ipstack_log_level
+            && self.overtls_log_level == other.overtls_log_level
+            && self.tun2proxy_log_level == other.tun2proxy_log_level
+            && self.log_level == other.log_level
+    }
 }