Skip to content

Display and control your Android device

Destroy objects after join()

Romain Vimont91669808ed26
diff --git a/app/src/scrcpy.c b/app/src/scrcpy.c
index 86a5313b..10b98460 100644
--- a/app/src/scrcpy.c
+++ b/app/src/scrcpy.c
@@ -914,21 +914,9 @@ end:
// end-of-stream
#ifdef HAVE_USB
if (aoa_hid_initialized) {
- if (keyboard_aoa_initialized) {
- sc_keyboard_aoa_destroy(&s->keyboard_aoa);
- }
- if (mouse_aoa_initialized) {
- sc_mouse_aoa_destroy(&s->mouse_aoa);
- }
- if (gamepad_aoa_initialized) {
- sc_gamepad_aoa_destroy(&s->gamepad_aoa);
- }
sc_aoa_stop(&s->aoa);
sc_usb_stop(&s->usb);
}
- if (acksync) {
- sc_acksync_destroy(acksync);
- }
#endif
if (controller_started) {
sc_controller_stop(&s->controller);
@@ -989,6 +977,19 @@ end:
sc_usb_join(&s->usb);
sc_usb_disconnect(&s->usb);
sc_usb_destroy(&s->usb);
+
+ if (keyboard_aoa_initialized) {
+ sc_keyboard_aoa_destroy(&s->keyboard_aoa);
+ }
+ if (mouse_aoa_initialized) {
+ sc_mouse_aoa_destroy(&s->mouse_aoa);
+ }
+ if (gamepad_aoa_initialized) {
+ sc_gamepad_aoa_destroy(&s->gamepad_aoa);
+ }
+ }
+ if (acksync) {
+ sc_acksync_destroy(acksync);
}
#endif