it actually works now

Author: Brendonovich

apps/desktop/src-tauri/src/general_settings.rs

@@ -25,8 +25,8 @@ pub enum MainWindowRecordingStartBehaviour {
 #[serde(rename_all = "camelCase")]
 pub enum PostDeletionBehaviour {
     #[default]
-    CloseWindow,
-    KeepWindowOpen,
+    Exit,
+    ReopenRecordingWindow,
 }
 
 impl MainWindowRecordingStartBehaviour {
@@ -129,7 +129,7 @@ impl Default for GeneralSettingsStore {
             _open_editor_after_recording: false,
             enable_native_camera_preview: false,
             auto_zoom_on_clicks: false,
-            post_deletion_behaviour: PostDeletionBehaviour::CloseWindow,
+            post_deletion_behaviour: PostDeletionBehaviour::Exit,
         }
     }
 }

apps/desktop/src-tauri/src/recording.rs

@@ -485,6 +485,7 @@ pub async fn start_recording(
                     // this clears the current recording for us
                     handle_recording_end(app, None, &mut state).await.ok();
                 }
+                // Actor hasn't errored, it's just finished
                 _ => {}
             }
         }
@@ -595,16 +596,19 @@ pub async fn delete_recording(app: AppHandle, state: MutableState<'_, App>) -> R
             .ok()
             .flatten()
             .unwrap_or_default();
+
+        if let Some(window) = CapWindowId::InProgressRecording.get(&app) {
+            let _ = window.close();
+        }
+
         match settings.post_deletion_behaviour {
-            PostDeletionBehaviour::CloseWindow => {
-                // Close the in-progress recording window (current behavior)
-                if let Some(window) = CapWindowId::InProgressRecording.get(&app) {
+            PostDeletionBehaviour::Exit => {
+                if let Some(window) = CapWindowId::Main.get(&app) {
                     let _ = window.close();
                 }
             }
-            PostDeletionBehaviour::KeepWindowOpen => {
-                // Keep window open - no action needed, just emit events to reset UI
-                // The frontend will handle resetting the recording state
+            PostDeletionBehaviour::ReopenRecordingWindow => {
+                let _ = ShowCapWindow::Main.show(&app).await;
             }
         }
     }

apps/desktop/src/routes/(window-chrome)/settings/general.tsx

@@ -152,7 +152,10 @@ function Inner(props: { initialStore: GeneralSettingsStore | null }) {
       | PostDeletionBehaviour
       | number;
     onChange: (
-      value: MainWindowRecordingStartBehaviour | PostStudioRecordingBehaviour | PostDeletionBehaviour
+      value:
+        | MainWindowRecordingStartBehaviour
+        | PostStudioRecordingBehaviour
+        | PostDeletionBehaviour
     ) => void | Promise<void>;
   };
 
@@ -449,8 +452,11 @@ function Inner(props: { initialStore: GeneralSettingsStore | null }) {
                             () => item.value,
                             item.onChange,
                             [
-                              { text: "Close window", value: "closeWindow" },
-                              { text: "Keep window open", value: "keepWindowOpen" },
+                              { text: "Hide Cap", value: "exit" },
+                              {
+                                text: "Open Cap",
+                                value: "reopenRecordingWindow",
+                              },
                             ]
                           );
                         }

apps/desktop/src/utils/tauri.ts

@@ -383,7 +383,7 @@ export type OSPermissionStatus = "notNeeded" | "empty" | "granted" | "denied"
 export type OSPermissionsCheck = { screenRecording: OSPermissionStatus; microphone: OSPermissionStatus; camera: OSPermissionStatus; accessibility: OSPermissionStatus }
 export type Plan = { upgraded: boolean; manual: boolean; last_checked: number }
 export type Platform = "MacOS" | "Windows"
-export type PostDeletionBehaviour = "closeWindow" | "keepWindowOpen"
+export type PostDeletionBehaviour = "exit" | "reopenRecordingWindow"
 export type PostStudioRecordingBehaviour = "openEditor" | "showOverlay"
 export type Preset = { name: string; config: ProjectConfiguration }
 export type PresetsStore = { presets: Preset[]; default: number | null }

crates/recording/src/studio_recording.rs

@@ -450,7 +450,15 @@ async fn run_actor_iteration(
         // Cancel from any state
         (Msg::Cancel(tx), state) => {
             let result = match state {
-                State::Recording { mut pipeline, .. } => pipeline.inner.shutdown().await,
+                State::Recording { mut pipeline, .. } => {
+                    if let Some(cursor) = &mut pipeline.cursor
+                        && let Some(actor) = cursor.actor.take()
+                    {
+                        actor.stop().await;
+                    }
+
+                    pipeline.inner.shutdown().await
+                }
                 State::Paused { .. } => Ok(()),
             };
 

packages/ui-solid/src/auto-imports.d.ts

@@ -6,20 +6,69 @@
 // biome-ignore lint: disable
 export {}
 declare global {
+  const IconCapAudioOn: typeof import('~icons/cap/audio-on.jsx')['default']
+  const IconCapBgBlur: typeof import('~icons/cap/bg-blur.jsx')['default']
   const IconCapCamera: typeof import('~icons/cap/camera.jsx')['default']
+  const IconCapCaptions: typeof import('~icons/cap/captions.jsx')['default']
   const IconCapChevronDown: typeof import('~icons/cap/chevron-down.jsx')['default']
+  const IconCapCircleCheck: typeof import('~icons/cap/circle-check.jsx')['default']
+  const IconCapCirclePlus: typeof import('~icons/cap/circle-plus.jsx')['default']
+  const IconCapCircleX: typeof import('~icons/cap/circle-x.jsx')['default']
+  const IconCapCopy: typeof import('~icons/cap/copy.jsx')['default']
+  const IconCapCorners: typeof import('~icons/cap/corners.jsx')['default']
   const IconCapCrop: typeof import('~icons/cap/crop.jsx')['default']
+  const IconCapCursor: typeof import('~icons/cap/cursor.jsx')['default']
+  const IconCapEnlarge: typeof import('~icons/cap/enlarge.jsx')['default']
+  const IconCapFile: typeof import('~icons/cap/file.jsx')['default']
   const IconCapFilmCut: typeof import('~icons/cap/film-cut.jsx')['default']
+  const IconCapGauge: typeof import('~icons/cap/gauge.jsx')['default']
+  const IconCapHotkeys: typeof import('~icons/cap/hotkeys.jsx')['default']
+  const IconCapImage: typeof import('~icons/cap/image.jsx')['default']
   const IconCapInfo: typeof import('~icons/cap/info.jsx')['default']
   const IconCapInstant: typeof import('~icons/cap/instant.jsx')['default']
+  const IconCapLayout: typeof import('~icons/cap/layout.jsx')['default']
+  const IconCapLink: typeof import('~icons/cap/link.jsx')['default']
   const IconCapLogo: typeof import('~icons/cap/logo.jsx')['default']
   const IconCapLogoFull: typeof import('~icons/cap/logo-full.jsx')['default']
   const IconCapLogoFullDark: typeof import('~icons/cap/logo-full-dark.jsx')['default']
+  const IconCapMessageBubble: typeof import('~icons/cap/message-bubble.jsx')['default']
   const IconCapMicrophone: typeof import('~icons/cap/microphone.jsx')['default']
+  const IconCapMoreVertical: typeof import('~icons/cap/more-vertical.jsx')['default']
+  const IconCapNext: typeof import('~icons/cap/next.jsx')['default']
+  const IconCapPadding: typeof import('~icons/cap/padding.jsx')['default']
+  const IconCapPause: typeof import('~icons/cap/pause.jsx')['default']
+  const IconCapPauseCircle: typeof import('~icons/cap/pause-circle.jsx')['default']
+  const IconCapPlay: typeof import('~icons/cap/play.jsx')['default']
+  const IconCapPlayCircle: typeof import('~icons/cap/play-circle.jsx')['default']
+  const IconCapPresets: typeof import('~icons/cap/presets.jsx')['default']
+  const IconCapPrev: typeof import('~icons/cap/prev.jsx')['default']
+  const IconCapRedo: typeof import('~icons/cap/redo.jsx')['default']
+  const IconCapRestart: typeof import('~icons/cap/restart.jsx')['default']
+  const IconCapScissors: typeof import('~icons/cap/scissors.jsx')['default']
   const IconCapSettings: typeof import('~icons/cap/settings.jsx')['default']
+  const IconCapShadow: typeof import('~icons/cap/shadow.jsx')['default']
+  const IconCapStopCircle: typeof import('~icons/cap/stop-circle.jsx')['default']
+  const IconCapTrash: typeof import('~icons/cap/trash.jsx')['default']
+  const IconCapUndo: typeof import('~icons/cap/undo.jsx')['default']
+  const IconCapZoomIn: typeof import('~icons/cap/zoom-in.jsx')['default']
+  const IconCapZoomOut: typeof import('~icons/cap/zoom-out.jsx')['default']
+  const IconHugeiconsEaseCurveControlPoints: typeof import('~icons/hugeicons/ease-curve-control-points.jsx')['default']
   const IconLucideBell: typeof import('~icons/lucide/bell.jsx')['default']
   const IconLucideBug: typeof import('~icons/lucide/bug.jsx')['default']
+  const IconLucideCheck: typeof import('~icons/lucide/check.jsx')['default']
+  const IconLucideClock: typeof import('~icons/lucide/clock.jsx')['default']
+  const IconLucideDatabase: typeof import('~icons/lucide/database.jsx')['default']
+  const IconLucideFolder: typeof import('~icons/lucide/folder.jsx')['default']
   const IconLucideGift: typeof import('~icons/lucide/gift.jsx')['default']
+  const IconLucideHardDrive: typeof import('~icons/lucide/hard-drive.jsx')['default']
+  const IconLucideLoaderCircle: typeof import('~icons/lucide/loader-circle.jsx')['default']
+  const IconLucideMessageSquarePlus: typeof import('~icons/lucide/message-square-plus.jsx')['default']
+  const IconLucideMicOff: typeof import('~icons/lucide/mic-off.jsx')['default']
+  const IconLucideMonitor: typeof import('~icons/lucide/monitor.jsx')['default']
+  const IconLucideRotateCcw: typeof import('~icons/lucide/rotate-ccw.jsx')['default']
+  const IconLucideSearch: typeof import('~icons/lucide/search.jsx')['default']
   const IconLucideSquarePlay: typeof import('~icons/lucide/square-play.jsx')['default']
+  const IconLucideUnplug: typeof import('~icons/lucide/unplug.jsx')['default']
+  const IconLucideVolume2: typeof import('~icons/lucide/volume2.jsx')['default']
   const IconPhMonitorBold: typeof import('~icons/ph/monitor-bold.jsx')['default']
 }