don't panic on notify error (#10)

jacob-pro · web-flow · commit f5e4d2fa718c · 2024-02-26T22:17:10.000Z
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wsl2-dns-agent"
-version = "0.3.5"
+version = "0.3.6"
 edition = "2021"
 license = "GPL-3.0"
 description = "An agent that automatically patches your WSL2 DNS configuration for users of Cisco AnyConnect (or similar VPNs)"
@@ -18,7 +18,7 @@ serde = { version = "1.0.137", features = ["derive"] }
 simplelog = "0.12.0"
 thiserror = "1.0.31"
 toml = "0.5.9"
-win32-utils = { git = "https://github.com/jacob-pro/win32-utils", features = ["net", "window", "instance"] }
+win32-utils = { git = "https://github.com/jacob-pro/win32-utils", features = ["net", "window", "instance"], rev = "055c60695dbc4d300f3caaacec25ae82415fa545" }
 
 [dependencies.windows]
 version = "0.37.0"
diff --git a/src/runner.rs b/src/runner.rs
@@ -49,6 +49,7 @@ pub fn start_runner(config: Config, rx: mpsc::Receiver<RunReason>, tray: TrayHan
 }
 
 #[derive(Debug, Error)]
+#[allow(clippy::enum_variant_names)]
 enum Error {
     #[error("Win32 DNS error: {0}")]
     Dns(
diff --git a/src/tray.rs b/src/tray.rs
@@ -188,7 +188,8 @@ impl TrayProperties {
             .copy_to_wchar_buffer(&mut self.icon.szInfoTitle)
             .unwrap();
         message.copy_to_wchar_buffer(&mut self.icon.szInfo).unwrap();
-        Shell_NotifyIconW(NIM_MODIFY, &self.icon).ok().unwrap();
+        // https://github.com/jacob-pro/wsl2-dns-agent/issues/9
+        Shell_NotifyIconW(NIM_MODIFY, &self.icon);
     }
 
     unsafe fn show_tray_menu(&self) {

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ pub fn start_runner(config: Config, rx: mpsc::Receiver<RunReason>, tray: TrayHan`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`#[derive(Debug, Error)]`
	`52`	`+#[allow(clippy::enum_variant_names)]`
`52`	`53`	`enum Error {`
`53`	`54`	`#[error("Win32 DNS error: {0}")]`
`54`	`55`	`Dns(`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,8 @@ impl TrayProperties {`
`188`	`188`	`.copy_to_wchar_buffer(&mut self.icon.szInfoTitle)`
`189`	`189`	`.unwrap();`
`190`	`190`	`message.copy_to_wchar_buffer(&mut self.icon.szInfo).unwrap();`
`191`		`- Shell_NotifyIconW(NIM_MODIFY, &self.icon).ok().unwrap();`
	`191`	`+ // https://github.com/jacob-pro/wsl2-dns-agent/issues/9`
	`192`	`+ Shell_NotifyIconW(NIM_MODIFY, &self.icon);`
`192`	`193`	`}`
`193`	`194`
`194`	`195`	`unsafe fn show_tray_menu(&self) {`