Merge branch 'Genymobile:dev' into dev

This commit is contained in:
苏明白 2025-02-11 10:56:59 +08:00 committed by GitHub
commit 5a9015a0a5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions

View file

@ -399,7 +399,7 @@ Disable video playback on the computer.
.TP .TP
.B \-\-no\-window .B \-\-no\-window
Disable scrcpy window. Implies --no-video-playback and --no-control. Disable scrcpy window. Implies --no-video-playback.
.TP .TP
.BI "\-\-orientation " value .BI "\-\-orientation " value

View file

@ -704,8 +704,7 @@ static const struct sc_option options[] = {
{ {
.longopt_id = OPT_NO_WINDOW, .longopt_id = OPT_NO_WINDOW,
.longopt = "no-window", .longopt = "no-window",
.text = "Disable scrcpy window. Implies --no-video-playback and " .text = "Disable scrcpy window. Implies --no-video-playback.",
"--no-control.",
}, },
{ {
.longopt_id = OPT_ORIENTATION, .longopt_id = OPT_ORIENTATION,
@ -2799,9 +2798,10 @@ parse_args_with_getopt(struct scrcpy_cli_args *args, int argc, char *argv[],
#endif #endif
if (!opts->window) { if (!opts->window) {
// Without window, there cannot be any video playback or control // Without window, there cannot be any video playback
opts->video_playback = false; opts->video_playback = false;
opts->control = false; // Controls are still possible, allowing for options like
// --turn-screen-off
} }
if (!opts->video) { if (!opts->video) {