From 8aeb5c0e3ccb43864d3ce0bd4d8af8f83d11e5d6 Mon Sep 17 00:00:00 2001 From: Romain Vimont Date: Sat, 2 Mar 2019 18:09:55 +0100 Subject: [PATCH] Fix cleanup order The order of cleanup was not the reverse as the initialization order. As a consequence, recorder_destroy() could theoretically be called even if recorder_init() failed. --- app/src/scrcpy.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/scrcpy.c b/app/src/scrcpy.c index fa347bf5..ed91479d 100644 --- a/app/src/scrcpy.c +++ b/app/src/scrcpy.c @@ -291,14 +291,14 @@ finally_stop_decoder: // stop the server before decoder_join() to wake up the decoder server_stop(&server); decoder_join(&decoder); -finally_destroy_file_handler: - file_handler_stop(&file_handler); - file_handler_join(&file_handler); - file_handler_destroy(&file_handler); finally_destroy_recorder: if (options->record_filename) { recorder_destroy(&recorder); } +finally_destroy_file_handler: + file_handler_stop(&file_handler); + file_handler_join(&file_handler); + file_handler_destroy(&file_handler); finally_destroy_video_buffer: video_buffer_destroy(&video_buffer); finally_destroy_server: