fix(tray): case sensitive comparison

eythaann · Jan 30, 2025 · e5acb97 · e5acb97
1 parent 44ce498
commit e5acb97
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/background/modules/cli/mod.rs b/src/background/modules/cli/mod.rs
@@ -137,9 +137,12 @@ impl ServiceClient {
             let mut action_path = windows_core::BSTR::new();
             action.Path(&mut action_path)?;
 
-            let action_path = PathBuf::from(action_path.to_string());
-            let service_path = std::env::current_exe()?.with_file_name("slu-service.exe");
-            match action_path == service_path {
+            let service_path = std::env::current_exe()?
+                .with_file_name("slu-service.exe")
+                .to_string_lossy()
+                .to_lowercase();
+
+            match action_path.to_string().to_lowercase() == service_path {
                 true => {
                     task.Run(None)?;
                     Ok(())

diff --git a/src/background/modules/tray/application.rs b/src/background/modules/tray/application.rs
@@ -254,8 +254,9 @@ impl TrayIconManager {
                 };
                 item.is_running = unsafe { Shell_NotifyIconGetRect(&identifier).is_ok() };
             } else if let Some(uid) = &item.icon_uid {
+                let str_item_exe_path = item.executable_path.to_string_lossy().to_lowercase();
                 item.is_running = windows.iter().any(|w| match w.process().program_path() {
-                    Ok(path) if path == item.executable_path => {
+                    Ok(path) if path.to_string_lossy().to_lowercase() == str_item_exe_path => {
                         let identifier = NOTIFYICONIDENTIFIER {
                             cbSize: std::mem::size_of::<NOTIFYICONIDENTIFIER>() as u32,
                             hWnd: w.hwnd(),