better error display

marci1175 · Nov 30, 2023 · ba1630a · ba1630a
1 parent 7a04230
commit ba1630a
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/app/ui/login.rs b/src/app/ui/login.rs
@@ -1,9 +1,12 @@
+use std::iter;
+
 use crate::app::account_manager::{login, register};
 
 use crate::app::backend::TemplateApp;
 use device_query::Keycode;
 use egui::{vec2, Align, Layout, RichText};
 
+use windows_sys::core::HSTRING;
 use windows_sys::w;
 use windows_sys::Win32::UI::WindowsAndMessaging::{MessageBoxW, MB_ICONWARNING, MB_ICONERROR};
 
@@ -37,11 +40,10 @@ impl TemplateApp {
                                 true
                             }
                             Err(err) => {
-                                dbg!(err);
-                                std::thread::spawn(|| unsafe {
+                                std::thread::spawn(move || unsafe {
                                     MessageBoxW(
                                         0,
-                                        w!("Invalid password"),
+                                        str::encode_utf16(err.to_string().as_str()).chain(iter::once(0)).collect::<Vec<_>>().as_ptr(),
                                         w!("Error"),
                                         MB_ICONERROR,
                                     );
@@ -60,11 +62,10 @@ impl TemplateApp {
                     match register(self.login_username.clone(), self.login_password.clone()) {
                         Ok(_) => {}
                         Err(err) => {
-                            dbg!(err);
-                            std::thread::spawn(|| unsafe {
+                            std::thread::spawn(move || unsafe {
                                 MessageBoxW(
                                     0,
-                                    w!("User already exists"),
+                                    str::encode_utf16(err.to_string().as_str()).chain(iter::once(0)).collect::<Vec<_>>().as_ptr(),
                                     w!("Error"),
                                     MB_ICONWARNING,
                                 );