Display and control your Android device
Simplify OpenGLRunner shutdown
Romain Vimont5b220515c6b6
diff --git a/server/src/main/java/com/genymobile/scrcpy/Server.java b/server/src/main/java/com/genymobile/scrcpy/Server.javaindex f3e87e87..d7d1a76b 100644--- a/server/src/main/java/com/genymobile/scrcpy/Server.java+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java@@ -185,8 +185,7 @@ public final class Server {asyncProcessor.join();}- OpenGLRunner.quit(); // quit the OpenGL thread, if any- OpenGLRunner.join();+ OpenGLRunner.shutdown();} catch (InterruptedException e) {// ignore}diff --git a/server/src/main/java/com/genymobile/scrcpy/opengl/OpenGLRunner.java b/server/src/main/java/com/genymobile/scrcpy/opengl/OpenGLRunner.javaindex d7204010..232f68d1 100644--- a/server/src/main/java/com/genymobile/scrcpy/opengl/OpenGLRunner.java+++ b/server/src/main/java/com/genymobile/scrcpy/opengl/OpenGLRunner.java@@ -23,7 +23,6 @@ public final class OpenGLRunner {private static HandlerThread handlerThread;private static Handler handler;- private static boolean quit;private EGLDisplay eglDisplay;private EGLContext eglContext;@@ -49,32 +48,19 @@ public final class OpenGLRunner {public static synchronized void initOnce() {if (handlerThread == null) {- if (quit) {- throw new IllegalStateException("Could not init OpenGLRunner after it is quit");- }handlerThread = new HandlerThread("OpenGLRunner");handlerThread.start();handler = new Handler(handlerThread.getLooper());}}- public static void quit() {+ public static void shutdown() throws InterruptedException {HandlerThread thread;synchronized (OpenGLRunner.class) {thread = handlerThread;- quit = true;}if (thread != null) {thread.quitSafely();- }- }-- public static void join() throws InterruptedException {- HandlerThread thread;- synchronized (OpenGLRunner.class) {- thread = handlerThread;- }- if (thread != null) {thread.join();}}