hotfix: fixing issue w/ wizard stalling tauri when opened in on_page_…

…load (#177)
spyglass-search · Aug 26, 2022 · 9f10e0f · 9f10e0f
1 parent ab7c9b5
commit 9f10e0f
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/crates/tauri/src/main.rs b/crates/tauri/src/main.rs
@@ -152,7 +152,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             let rpc = tauri::async_runtime::block_on(rpc::RpcClient::new());
             app.manage(Arc::new(Mutex::new(rpc)));
             // Load user settings
-            app.manage(config);
+            app.manage(config.clone());
             app.manage(Arc::new(PauseState::new(false)));
 
             // Center window horizontally in the current screen
@@ -168,6 +168,14 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
                 }
             });
 
+            if !config.user_settings.run_wizard {
+                window::show_wizard_window(&window.app_handle());
+                // Only run the wizard once.
+                let mut updated = config.user_settings.clone();
+                updated.run_wizard = true;
+                let _ = config.save_user_settings(&updated);
+            }
+
             Ok(())
         })
         .on_window_event(|event| {
@@ -248,15 +256,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
                 }
                 Err(e) => window::alert(&window_clone, "Error registering global shortcut", &format!("{}", e))
             }
-
-            if !config.user_settings.run_wizard {
-                window::show_wizard_window(&window.app_handle());
-                // Only run the wizard once.
-                let mut updated = config.user_settings.clone();
-                updated.run_wizard = true;
-                let _ = config.save_user_settings(&updated);
-            }
-
         })
         .run(ctx)
         .expect("error while running tauri application");