From 4d519bb225844a292abc9236d823b799be2f4349 Mon Sep 17 00:00:00 2001
From: YohBur <yburnetransfert@icloud.com>
Date: Sun, 26 May 2024 21:42:18 +0100
Subject: [PATCH] Attempt

---
 .../community/client/OBSRemoteController.java |  3 +++
 .../client/OBSRemoteControllerBuilder.java    | 26 +++++++++----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/client/src/main/java/io/obswebsocket/community/client/OBSRemoteController.java b/client/src/main/java/io/obswebsocket/community/client/OBSRemoteController.java
index 171964ab..5e55dd50 100644
--- a/client/src/main/java/io/obswebsocket/community/client/OBSRemoteController.java
+++ b/client/src/main/java/io/obswebsocket/community/client/OBSRemoteController.java
@@ -95,6 +95,9 @@ public void connect() {
       // Block on the connection succeeding
       connection.get(this.connectionTimeoutSeconds, TimeUnit.SECONDS);
     } catch (Throwable t) {
+      try {
+        this.webSocketClient.stop();
+      } catch (Exception ignored) {}
       // If the exception is caused by OBS being unavailable over the network
       // (or not installed or started), then call onError with helpful message
       if (
diff --git a/client/src/main/java/io/obswebsocket/community/client/OBSRemoteControllerBuilder.java b/client/src/main/java/io/obswebsocket/community/client/OBSRemoteControllerBuilder.java
index 5a06b12d..4a3b37fa 100644
--- a/client/src/main/java/io/obswebsocket/community/client/OBSRemoteControllerBuilder.java
+++ b/client/src/main/java/io/obswebsocket/community/client/OBSRemoteControllerBuilder.java
@@ -18,8 +18,8 @@ public class OBSRemoteControllerBuilder {
   private final OBSCommunicatorBuilder obsCommunicatorBuilder = new OBSCommunicatorBuilder();
   private final LifecycleListenerBuilderFacade lifecycleListenerBuilderFacade = new LifecycleListenerBuilderFacade(
           this,
-          obsCommunicatorBuilder.lifecycle(),
-          controllerLifecycleListenerBuilder
+          this.obsCommunicatorBuilder.lifecycle(),
+          this.controllerLifecycleListenerBuilder
   );
   private OBSCommunicator communicator;
 
@@ -40,7 +40,7 @@ public OBSRemoteControllerBuilder port(int port) {
   }
 
   public OBSRemoteControllerBuilder password(String password) {
-    obsCommunicatorBuilder.password(password);
+    this.obsCommunicatorBuilder.password(password);
     return this;
   }
 
@@ -61,7 +61,7 @@ public OBSRemoteControllerBuilder autoConnect(boolean autoConnect) {
   }
 
   public LifecycleListenerBuilderFacade lifecycle() {
-    return lifecycleListenerBuilderFacade;
+    return this.lifecycleListenerBuilderFacade;
   }
 
   public OBSRemoteControllerBuilder communicator(OBSCommunicator communicator) {
@@ -72,15 +72,15 @@ public OBSRemoteControllerBuilder communicator(OBSCommunicator communicator) {
   public OBSRemoteController build() {
 
     return new OBSRemoteController(
-            webSocketClient,
-            communicator == null
-                    ? obsCommunicatorBuilder.build()
-                    : communicator,
-            controllerLifecycleListenerBuilder.build(),
-            host,
-            port,
-            connectionTimeoutSeconds,
-            autoConnect
+            this.webSocketClient,
+            this.communicator == null
+                    ? this.obsCommunicatorBuilder.build()
+                    : this.communicator,
+            this.controllerLifecycleListenerBuilder.build(),
+            this.host,
+            this.port,
+            this.connectionTimeoutSeconds,
+            this.autoConnect
     );
 
   }