Skip to content

fix(desktop): don't close picker webview before window screenshot #2054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oshtz wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −4
Open

fix(desktop): don't close picker webview before window screenshot #2054

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions apps/desktop/src/routes/target-select-overlay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,8 +694,12 @@ function Inner() {
onRecordingStart={() => {
setOriginalCameraBounds(null);
if (options.mode === "screenshot") {
// The window variant has always dismissed the picker
// for screenshots too; keep that, tagged as such.
// Only mark the dismissal here. takeScreenshot is
// invoked from THIS webview right after, and closing
Comment thread
oshtz marked this conversation as resolved.
// destroys the webview before the invoke is dispatched,
// so the screenshot silently never happens. The start
// handler hides these windows and closes them once the
// capture is done.
if (options.targetModeSource === "editor") {
setOptions({
targetMode: null,
Expand All @@ -708,7 +712,6 @@ function Inner() {
targetModeDismissal: "screenshot",
Comment thread
oshtz marked this conversation as resolved.
});
}
commands.closeTargetSelectOverlays();
} else {
dismissPickerForRecordingStart();
}
Expand Down Expand Up @@ -2005,11 +2008,16 @@ function RecordingControls(props: {
if (shouldOpenEditor) {
await commands.showWindow({ ScreenshotEditor: { path } });
}
await commands.closeTargetSelectOverlays();
} catch (e) {
const message = e instanceof Error ? e.message : String(e);
toast.error(`Failed to take screenshot: ${message}`);
console.error("Failed to take screenshot", e);
} finally {
await commands
.closeTargetSelectOverlays()
.catch((e) =>
console.error("Failed to close target select overlays", e),
);
}
return;
}
Expand Down