drgreen/scrcpy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not warn on terminating the server

Browse Source 
If the server is already dead, terminating it fails. This is expected.
This commit is contained in:
Romain Vimont 2020-03-29 00:49:08 +01:00
parent 943d264b35
commit 73d098872c
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/server.c
View File

@ -381,9 +381,7 @@ server_start(struct server *server, const char *serial,
server->wait_server_thread = server->wait_server_thread =
SDL_CreateThread(run_wait_server, "wait-server", server); SDL_CreateThread(run_wait_server, "wait-server", server);
if (!server->wait_server_thread) { if (!server->wait_server_thread) {
if (!cmd_terminate(server->process)) { cmd_terminate(server->process);
LOGW("Could not terminate server");
}
cmd_simple_wait(server->process, NULL); // ignore exit code cmd_simple_wait(server->process, NULL); // ignore exit code
goto error3; goto error3;
} }
@ -474,9 +472,7 @@ server_stop(struct server *server) {
assert(server->process != PROCESS_NONE); assert(server->process != PROCESS_NONE);
if (!cmd_terminate(server->process)) { cmd_terminate(server->process);
LOGW("Could not terminate server");
}
if (server->tunnel_enabled) { if (server->tunnel_enabled) {
// ignore failure // ignore failure