diff options
Diffstat (limited to 'app/src/main/java/invalid/lena/scrcpy/VideoStream.java')
| -rw-r--r-- | app/src/main/java/invalid/lena/scrcpy/VideoStream.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/src/main/java/invalid/lena/scrcpy/VideoStream.java b/app/src/main/java/invalid/lena/scrcpy/VideoStream.java index 4eb62d3..7ecb3f1 100644 --- a/app/src/main/java/invalid/lena/scrcpy/VideoStream.java +++ b/app/src/main/java/invalid/lena/scrcpy/VideoStream.java @@ -61,7 +61,12 @@ public final class VideoStream { public void stop() { stop = true; - if (thread != null) thread.interrupt(); + Thread t = thread; + if (t == null) return; + t.interrupt(); + if (t == Thread.currentThread()) return; + try { t.join(1_000); } + catch (InterruptedException e) { Thread.currentThread().interrupt(); } } public void setRecorder(VideoRecorder r) { |