Skip to content

Display and control your Android device

Fix adb forward initialization

Romain Vimontb9315620e2df
diff --git a/server/src/main/java/com/genymobile/scrcpy/DesktopConnection.java b/server/src/main/java/com/genymobile/scrcpy/DesktopConnection.java
index 20ab1f9c..c3408fff 100644
--- a/server/src/main/java/com/genymobile/scrcpy/DesktopConnection.java
+++ b/server/src/main/java/com/genymobile/scrcpy/DesktopConnection.java
@@ -64,8 +64,6 @@ public final class DesktopConnection implements Closeable {
throws IOException {
String socketName = getSocketName(scid);
- LocalSocket firstSocket = null;
-
LocalSocket videoSocket = null;
LocalSocket audioSocket = null;
LocalSocket controlSocket = null;
@@ -74,24 +72,28 @@ public final class DesktopConnection implements Closeable {
try (LocalServerSocket localServerSocket = new LocalServerSocket(socketName)) {
if (video) {
videoSocket = localServerSocket.accept();
- firstSocket = videoSocket;
+ if (sendDummyByte) {
+ // send one byte so the client may read() to detect a connection error
+ videoSocket.getOutputStream().write(0);
+ sendDummyByte = false;
+ }
}
if (audio) {
audioSocket = localServerSocket.accept();
- if (firstSocket == null) {
- firstSocket = audioSocket;
+ if (sendDummyByte) {
+ // send one byte so the client may read() to detect a connection error
+ audioSocket.getOutputStream().write(0);
+ sendDummyByte = false;
}
}
if (control) {
controlSocket = localServerSocket.accept();
- if (firstSocket == null) {
- firstSocket = controlSocket;
+ if (sendDummyByte) {
+ // send one byte so the client may read() to detect a connection error
+ controlSocket.getOutputStream().write(0);
+ sendDummyByte = false;
}
}
- if (sendDummyByte) {
- // send one byte so the client may read() to detect a connection error
- firstSocket.getOutputStream().write(0);
- }
}
} else {
if (video) {