From 604e59ac7bd907567348627712185f1fa88e4659 Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Sat, 24 Feb 2024 22:33:58 +0100
Subject: [PATCH] Initialize controller before keyboards

The UHID keyboard initializer will need the controller.

PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>
---
 app/src/scrcpy.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/scrcpy.c b/app/src/scrcpy.c
index 7ecda6d0..a407dff1 100644
--- a/app/src/scrcpy.c
+++ b/app/src/scrcpy.c
@@ -542,6 +542,13 @@ scrcpy(struct scrcpy_options *options) {
     struct sc_mouse_processor *mp = NULL;
 
     if (options->control) {
+        if (!sc_controller_init(&s->controller, s->server.control_socket)) {
+            goto end;
+        }
+        controller_initialized = true;
+
+        controller = &s->controller;
+
 #ifdef HAVE_USB
         bool use_keyboard_aoa =
             options->keyboard_input_mode == SC_KEYBOARD_INPUT_MODE_AOA;
@@ -663,18 +670,12 @@ aoa_hid_end:
             mp = &s->mouse_sdk.mouse_processor;
         }
 
-        if (!sc_controller_init(&s->controller, s->server.control_socket)) {
-            goto end;
-        }
-        controller_initialized = true;
-
         sc_controller_set_acksync(&s->controller, acksync);
 
         if (!sc_controller_start(&s->controller)) {
             goto end;
         }
         controller_started = true;
-        controller = &s->controller;
     }
 
     // There is a controller if and only if control is enabled