Skip to content

Display and control your Android device

Configure init and cleanup asynchronously

Romain Vimontee93d2aac17d
diff --git a/server/src/main/java/com/genymobile/scrcpy/Server.java b/server/src/main/java/com/genymobile/scrcpy/Server.java
index db5bc7ec..5a1f4619 100644
--- a/server/src/main/java/com/genymobile/scrcpy/Server.java
+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java
@@ -63,7 +63,7 @@ public final class Server {
final Device device = new Device(options);
List<CodecOption> codecOptions = CodecOption.parse(options.getCodecOptions());
- initAndCleanUp(options);
+ Thread initThread = startInitThread(options);
boolean tunnelForward = options.isTunnelForward();
@@ -95,6 +95,7 @@ public final class Server {
// this is expected on close
Ln.d("Screen streaming stopped");
} finally {
+ initThread.interrupt();
if (controllerThread != null) {
controllerThread.interrupt();
}
@@ -105,6 +106,17 @@ public final class Server {
}
}
+ private static Thread startInitThread(final Options options) {
+ Thread thread = new Thread(new Runnable() {
+ @Override
+ public void run() {
+ initAndCleanUp(options);
+ }
+ });
+ thread.start();
+ return thread;
+ }
+
private static Thread startController(final Controller controller) {
Thread thread = new Thread(new Runnable() {
@Override