Merge pull request #35 from 0323pin/main

Fixes #34

src/main.rs

@@ -34,7 +34,7 @@ mod cli;
 mod image_io;
 
 #[derive(Serialize, Deserialize, Debug, Default)]
-pub struct Config {
+struct Config {
     maximized: bool,
     preferences: Preferences,
 }
@@ -211,7 +211,7 @@ impl<'a> WindowHandler<'a> {
 }
 
 impl WindowHandler<'_> {
-    pub fn main_loop(mut self) -> Config {
+    pub fn main_loop(mut self) {
         let WindowHandler {
             event_loop,
             mut app,
@@ -222,9 +222,6 @@ impl WindowHandler<'_> {
             mut wgpu,
         } = self;
 
-        let mut config = Config::default();
-        let config_ref = &mut config;
-
         let _ = event_loop.run(move |event, event_loop| match event {
             Event::Resumed => wgpu.window.set_visible(true),
             Event::NewEvents(..) => wgpu.window.request_redraw(),
@@ -407,17 +404,16 @@ impl WindowHandler<'_> {
             },
             Event::LoopExiting => {
                 wgpu.window.set_visible(false);
-                let maximized = wgpu.window.is_maximized();
-                *config_ref = Config {
-                    maximized,
+                let data = Config {
+                    maximized: wgpu.window.is_maximized(),
                     preferences: PREFERENCES.lock().unwrap().clone(),
                 };
+                confy::store("simp", None, data).unwrap();
+                std::process::exit(0);
             }
             Event::UserEvent(mut event) => app.handle_user_event(&wgpu, &mut event),
             _ => (),
         });
-
-        config
     }
 }
 
@@ -457,9 +453,5 @@ fn main() {
             .app
             .queue(Op::LoadPath(PathBuf::from(path), true))
     }
-
-    let config = window_handler.main_loop();
-    if let Err(err) = confy::store("simp", None, config) {
-        eprintln!("{err}");
-    };
+    window_handler.main_loop();
 }