finalize startup logic

CapSoftware · Nov 15, 2024 · 6a7beb5 · 6a7beb5 · vercel · Nov 15, 2024
1 parent a6da58d
commit 6a7beb5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/apps/desktop/src-tauri/src/general_settings.rs b/apps/desktop/src-tauri/src/general_settings.rs
@@ -20,7 +20,8 @@ pub struct GeneralSettingsStore {
     pub enable_notifications: bool,
     #[serde(default)]
     pub disable_auto_open_links: bool,
-    #[serde(default)]
+    // first launch: store won't exist so show startup
+    #[serde(default = "true_b")]
     pub has_completed_startup: bool,
 }
 

diff --git a/apps/desktop/src-tauri/src/lib.rs b/apps/desktop/src-tauri/src/lib.rs
@@ -2529,8 +2529,14 @@ pub async fn run() {
             let permissions = permissions::do_permissions_check(false);
             println!("Permissions check result: {:?}", permissions);
 
-            if !permissions.screen_recording.permitted() || !permissions.accessibility.permitted() {
-                println!("Required permissions not granted, showing permissions window");
+            if !permissions.screen_recording.permitted()
+                || !permissions.accessibility.permitted()
+                || GeneralSettingsStore::get(app.handle())
+                    .ok()
+                    .flatten()
+                    .map(|s| !s.has_completed_startup)
+                    .unwrap_or(false)
+            {
                 CapWindow::Setup.show(&app_handle).ok();
             } else {
                 println!("Permissions granted, showing main window");