Skip to content

Display and control your Android device

Simplify server_connect_to()

Romain Vimont8fc58bde75f7
diff --git a/app/src/server.c b/app/src/server.c
index 0d92cabc..8760362b 100644
--- a/app/src/server.c
+++ b/app/src/server.c
@@ -223,20 +223,20 @@ bool
server_connect_to(struct server *server) {
if (!server->tunnel_forward) {
server->device_socket = net_accept(server->server_socket);
+ if (server->device_socket == INVALID_SOCKET) {
+ return false;
+ }
+
+ // we don't need the server socket anymore
+ close_socket(&server->server_socket);
} else {
uint32_t attempts = 100;
uint32_t delay = 100; // ms
server->device_socket = connect_to_server(server->local_port, attempts,
delay);
- }
-
- if (server->device_socket == INVALID_SOCKET) {
- return false;
- }
-
- if (!server->tunnel_forward) {
- // we don't need the server socket anymore
- close_socket(&server->server_socket);
+ if (server->device_socket == INVALID_SOCKET) {
+ return false;
+ }
}
// we don't need the adb tunnel anymore