mirrors/scrcpy
0
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2025-04-22 12:35:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Split server stop() and join()

Browse source 
For consistency with the other components, call stop() and join()
separately.

This allows to stop all components, then join them all.
This commit is contained in:
Romain Vimont 2023-02-22 18:41:22 +01:00
parent 3dc2a05ea7
commit fa6ac8d44f
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/scrcpy.c
View file

@ -698,6 +698,10 @@ end:
sc_file_pusher_destroy(&s->file_pusher);
}
if (server_started) {
sc_server_join(&s->server);
}
sc_server_destroy(&s->server);
return ret;

3
app/src/server.c
View file

@ -904,7 +904,10 @@ sc_server_stop(struct sc_server *server) {
sc_cond_signal(&server->cond_stopped);
sc_intr_interrupt(&server->intr);
sc_mutex_unlock(&server->mutex);
}
void
sc_server_join(struct sc_server *server) {
sc_thread_join(&server->thread, NULL);
}

4
app/src/server.h
View file

@ -108,6 +108,10 @@ sc_server_start(struct sc_server *server);
void
sc_server_stop(struct sc_server *server);
// join the server thread
void
sc_server_join(struct sc_server *server);
// close and release sockets
void
sc_server_destroy(struct sc_server *server);