From 557daf280e03932ab1289a140d7920f756b0ad1f Mon Sep 17 00:00:00 2001 From: Romain Vimont Date: Sun, 23 Jan 2022 11:43:09 +0100 Subject: [PATCH] Pass NULL controller if control is disabled If --no-control is requested, then the controller instance is not initialized. However, its reference was still passed to screen and input_manager. Instead, pass NULL if no controller is available. --- app/src/scrcpy.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/scrcpy.c b/app/src/scrcpy.c index d7ba3670..5c2114eb 100644 --- a/app/src/scrcpy.c +++ b/app/src/scrcpy.c @@ -405,6 +405,7 @@ scrcpy(struct scrcpy_options *options) { stream_add_sink(&s->stream, &rec->packet_sink); } + struct sc_controller *controller = NULL; struct sc_key_processor *kp = NULL; struct sc_mouse_processor *mp = NULL; @@ -510,6 +511,7 @@ aoa_hid_end: goto end; } controller_started = true; + controller = &s->controller; if (options->turn_screen_off) { struct sc_control_msg msg; @@ -528,7 +530,7 @@ aoa_hid_end: options->window_title ? options->window_title : info->device_name; struct sc_screen_params screen_params = { - .controller = &s->controller, + .controller = controller, .fp = fp, .kp = kp, .mp = mp,