From 3e4d594b058ce53ec6befddf338c210c1f6227bf Mon Sep 17 00:00:00 2001
From: guylamar2006 <guychronister@outlook.com>
Date: Mon, 17 Feb 2025 21:13:42 +0000
Subject: [PATCH] Fix thread 'main' panicked at asusctl/src/main.rs:85:14:

---
 asusctl/src/main.rs | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/asusctl/src/main.rs b/asusctl/src/main.rs
index b4b8df9a..8aad40bc 100644
--- a/asusctl/src/main.rs
+++ b/asusctl/src/main.rs
@@ -74,22 +74,36 @@ fn main() {
         println!("\nError: {e}\n");
         print_info();
     }) {
-        let asusd_version = platform_proxy
-            .version()
-            .map_err(|e| {
+        let asusd_version = match platform_proxy.version() {
+            Ok(version) => version,
+            Err(e) => {
                 error!(
                     "Could not get asusd version: {e:?}\nIs asusd.service running? {}",
                     check_service("asusd")
                 );
-            })
-            .unwrap();
+                return;
+            }
+        };
+
         if asusd_version != self_version {
             println!("Version mismatch: asusctl = {self_version}, asusd = {asusd_version}");
             return;
         }
 
-        let supported_properties = platform_proxy.supported_properties().unwrap();
-        let supported_interfaces = list_iface_blocking().unwrap();
+        let supported_properties = match platform_proxy.supported_properties() {
+            Ok(props) => props,
+            Err(e) => {
+                error!("Could not get supported properties: {e:?}");
+                return;
+            }
+        };
+        let supported_interfaces = match list_iface_blocking() {
+            Ok(ifaces) => ifaces,
+            Err(e) => {
+                error!("Could not get supported interfaces: {e:?}");
+                return;
+            }
+        };
 
         if parsed.version {
             println!("asusctl v{}", env!("CARGO_PKG_VERSION"));