#22 - Reconnect to OBS less often

Author: Niels van de Weem

src/main/java/com/getpcpanel/obs/OBS.java

@@ -76,7 +76,7 @@ private void applicationEnding() {
 
     private void buildAndConnectObsController() {
         var save = this.save.get();
-        if (!save.isObsEnabled() || connected || shuttingDown) {
+        if (!save.isObsEnabled() || (connected && !settingsStillSame(false)) || shuttingDown) {
             log.trace("Obs is disabled({})/already connected({})/we are shutting down({})", save.isObsEnabled(), connected, shuttingDown);
             disconnectController();
             return;
@@ -94,7 +94,10 @@ private void buildAndConnectObsController() {
     private void doBuildAndConnectObsController() {
         var save = this.save.get();
         log.debug("Connecting to OBS");
-        if (settingsStillSame() && controller != null) {
+        if (settingsStillSame(true) && controller != null) {
+            if (connected) {
+                return;
+            }
             connected = true;
             controller.connect();
             return;
@@ -197,15 +200,17 @@ private void onError(ReasonThrowable reasonThrowable) {
         connected = false;
     }
 
-    private boolean settingsStillSame() {
+    private boolean settingsStillSame(boolean updatePrevious) {
         var port = NumberUtils.toInt(save.get().getObsPort(), -1);
         var address = save.get().getObsAddress();
         var password = StringUtils.trimToNull(save.get().getObsPassword());
         var settings = List.<Object>of(port, Objects.requireNonNullElse(address, "-"), Objects.requireNonNullElse(password, "-"));
         if (settings.equals(previousSettings)) {
             return true;
         }
-        previousSettings = settings;
+        if (updatePrevious) {
+            previousSettings = settings;
+        }
         return false;
     }