[FIX] DiscordRPC Double shutdown

Khikki · Apr 4, 2020 · 8c4b91f · 8c4b91f
1 parent dc5b56a
commit 8c4b91f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/DiscordRPC_lmodule/src/main/java/pro/gravit/launchermodules/discordrpc/ClientModule.java b/DiscordRPC_lmodule/src/main/java/pro/gravit/launchermodules/discordrpc/ClientModule.java
@@ -72,20 +72,20 @@ private void launcherInit(ClientEngineInitPhase phase)
     private void exitHandler(ClientExitPhase phase)
     {
         if(isClosed) return;
+        isClosed = true;
         if(DiscordRPC.thr != null) DiscordRPC.thr.interrupt();
         if(DiscordRPC.lib != null) DiscordRPC.lib.Discord_Shutdown();
         if(RequestEventWatcher.INSTANCE != null) Request.service.unregisterEventHandler(RequestEventWatcher.INSTANCE);
-        isClosed = true;
     }
     public static boolean isClosed = false;
     private void exitByStartClient(ClientProcessBuilderParamsWrittedEvent event)
     {
         if(isClosed) return;
         try {
+            isClosed = true;
             if(DiscordRPC.thr != null) DiscordRPC.thr.interrupt();
             if(DiscordRPC.lib != null) DiscordRPC.lib.Discord_Shutdown();
             if(RequestEventWatcher.INSTANCE != null) Request.service.unregisterEventHandler(RequestEventWatcher.INSTANCE);
-            isClosed = true;
         } catch (Throwable ignored)
         {