Repository navigation
fix(record): keep the Camera row off when no camera can be opened #1030
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| import { toast } from "sonner"; | ||
| import { requestCameraAccess } from "./requestCameraAccess"; | ||
|
|
||
| /** | ||
| * Whether the OS lists any camera at all. A Mac with no camera still grants | ||
| * camera access, so the permission check alone lets the toggle report success | ||
| * for a camera that can never open (#967). A failed enumeration answers `true`: | ||
| * not knowing is not "none", and the acquire reports the real failure. | ||
| */ | ||
| async function hasCameraDevice(): Promise<boolean> { | ||
| try { | ||
| const devices = await navigator.mediaDevices.enumerateDevices(); | ||
| return devices.some((device) => device.kind === "videoinput"); | ||
| } catch { | ||
| return true; | ||
| } | ||
| } | ||
|
|
||
| let pendingCheck: Promise<boolean> | null = null; | ||
|
|
||
| /** | ||
| * Whether the camera may be switched on, with a toast saying why not. | ||
| * | ||
| * The one check for every surface that turns the camera on (the HUD toggle, and the editor's | ||
| * Record mode), so neither stores `camEnabled: true` for a camera the other refuses (#998). | ||
| * A call made while one is pending, a double click, shares its answer: one access request, | ||
| * one toast. | ||
| * | ||
| * @param t The `editor` namespace translator. | ||
| */ | ||
| export function canTurnCameraOn(t: (key: string) => string): Promise<boolean> { | ||
| pendingCheck ??= checkCameraCanTurnOn(t).finally(() => { | ||
| pendingCheck = null; | ||
| }); | ||
| return pendingCheck; | ||
| } | ||
|
|
||
| async function checkCameraCanTurnOn(t: (key: string) => string): Promise<boolean> { | ||
| const accessResult = await requestCameraAccess(); | ||
| if (!accessResult.success) { | ||
| toast.error(t("recording.failedCameraAccess")); | ||
| return false; | ||
| } | ||
|
|
||
| if (!accessResult.granted) { | ||
| toast.error(t("recording.cameraBlocked")); | ||
| return false; | ||
| } | ||
|
|
||
| if (!(await hasCameraDevice())) { | ||
| toast.error(t("recording.cameraNotFound")); | ||
| // The toggles store nothing on failure, so clear an "on" left behind by a | ||
| // camera that was unplugged while it was in use. | ||
| void window.electronAPI?.setRecordingPrefs?.({ camEnabled: false }).catch((error) => { | ||
| console.warn("Failed to persist the camera preference:", error); | ||
| }); | ||
| return false; | ||
| } | ||
|
|
||
| return true; | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.