Use if let instead of unwrap for nullable callback

rust3ds · Feb 14, 2024 · 0535ba3 · 0535ba3
1 parent 65f7d26
commit 0535ba3
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/ctru-rs/src/applets/swkbd.rs b/ctru-rs/src/applets/swkbd.rs
@@ -858,12 +858,14 @@ impl SoftwareKeyboard {
 
         let mut retmsg = std::ptr::null();
 
-        swkbd.callback_result = extra.callback.unwrap()(
-            extra.callback_user,
-            &mut retmsg,
-            text8.as_ptr(),
-            text8.len(),
-        ) as _;
+        if let Some(cb) = extra.callback {
+            swkbd.callback_result = cb(
+                extra.callback_user,
+                &mut retmsg,
+                text8.as_ptr(),
+                text8.len(),
+            ) as _
+        };
 
         let retmsg = if !retmsg.is_null() {
             unsafe {