From b16d4d18359cced40c4218a353c16b0093ee0608 Mon Sep 17 00:00:00 2001 From: Romain Vimont Date: Mon, 5 Jun 2023 19:45:20 +0200 Subject: [PATCH] Fix adb server vs adb daemon confusion The adb daemon runs on the device, the adb server runs as a background process on the computer. --- app/src/server.c | 2 +- app/src/usb/scrcpy_otg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/server.c b/app/src/server.c index 4e70c4d9..2c0779d9 100644 --- a/app/src/server.c +++ b/app/src/server.c @@ -805,7 +805,7 @@ run_server(void *data) { // is parsed, so it is not output) bool ok = sc_adb_start_server(&server->intr, 0); if (!ok) { - LOGE("Could not start adb daemon"); + LOGE("Could not start adb server"); goto error_connection_failed; } diff --git a/app/src/usb/scrcpy_otg.c b/app/src/usb/scrcpy_otg.c index f469de1a..35d8d4cc 100644 --- a/app/src/usb/scrcpy_otg.c +++ b/app/src/usb/scrcpy_otg.c @@ -83,7 +83,7 @@ scrcpy_otg(struct scrcpy_options *options) { #ifdef _WIN32 // On Windows, only one process could open a USB device // - LOGI("Killing adb daemon (if any)..."); + LOGI("Killing adb server (if any)..."); unsigned flags = SC_ADB_NO_STDOUT | SC_ADB_NO_STDERR | SC_ADB_NO_LOGERR; // uninterruptible (intr == NULL), but in practice it's very quick sc_adb_kill_server(NULL, flags);