From 22773f644a9f39a4656f1ca2f21675ab4c7a90c8 Mon Sep 17 00:00:00 2001
From: Fenrir <fenrirwolf@gmail.com>
Date: Wed, 14 Feb 2024 14:11:58 -0700
Subject: [PATCH] Store initial_text data in SoftwareKeyboard

---
 ctru-rs/src/applets/swkbd.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ctru-rs/src/applets/swkbd.rs b/ctru-rs/src/applets/swkbd.rs
index 41d40cd..b1c4a28 100644
--- a/ctru-rs/src/applets/swkbd.rs
+++ b/ctru-rs/src/applets/swkbd.rs
@@ -22,6 +22,7 @@ pub struct SoftwareKeyboard {
     state: Box<SwkbdState>,
     callback: Option<Box<CallbackFunction>>,
     error_message: Option<CString>,
+    initial_text: Option<CString>,
 }
 
 /// Configuration structure to setup the Parental Lock applet.
@@ -233,6 +234,7 @@ impl SoftwareKeyboard {
                 state,
                 callback: None,
                 error_message: None,
+                initial_text: None,
             }
         }
     }
@@ -503,8 +505,12 @@ impl SoftwareKeyboard {
     #[doc(alias = "swkbdSetInitialText")]
     pub fn set_initial_text(&mut self, text: &str) {
         unsafe {
-            let nul_terminated: String = text.chars().chain(once('\0')).collect();
-            ctru_sys::swkbdSetInitialText(self.state.as_mut(), nul_terminated.as_ptr());
+            self.initial_text = Some(CString::new(text).unwrap());
+
+            ctru_sys::swkbdSetInitialText(
+                self.state.as_mut(),
+                self.initial_text.as_ref().unwrap().as_ptr(),
+            );
         }
     }