Enable autoconnect in connection state rehandshaking

kaaholst · May 20, 2024 · e9fa9d7 · e9fa9d7
1 parent 3f640d3
commit e9fa9d7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Squeezer/src/main/java/uk/org/ngo/squeezer/service/CometClient.java b/Squeezer/src/main/java/uk/org/ngo/squeezer/service/CometClient.java
@@ -211,6 +211,10 @@ public void startConnect(final SqueezeService service, boolean autoConnect) {
 
         // Start the background connect
         mBackgroundHandler.post(() -> {
+            mPendingRequests.clear();
+            mPendingBrowseRequests.clear();
+            mCommandQueue.clear();
+            mCurrentCommand = false;
             cleanupBayeuxClient();
 
             final Preferences.ServerAddress serverAddress = Squeezer.getPreferences().getServerAddress();
@@ -327,7 +331,6 @@ private void onConnected(boolean isSqueezeNetwork) {
         // If this is a rehandshake we may already have players.
         boolean rehandshake = !mConnectionState.isRehandshaking();
 
-        mCurrentCommand = false;
         mConnectionState.setConnectionState(ConnectionState.State.CONNECTION_COMPLETED);
 
         // Set a timeout for the handshake

diff --git a/Squeezer/src/main/java/uk/org/ngo/squeezer/service/ConnectionState.java b/Squeezer/src/main/java/uk/org/ngo/squeezer/service/ConnectionState.java
@@ -118,7 +118,7 @@ boolean isRehandshaking() {
     private final AtomicReference<String[]> mediaDirs = new AtomicReference<>();
 
     public boolean canAutoConnect() {
-        return (state == State.DISCONNECTED || state == State.CONNECTION_FAILED)
+        return (state == State.DISCONNECTED || state == State.CONNECTION_FAILED || state == State.REHANDSHAKING)
                 && ((SystemClock.elapsedRealtime() - autoConnect) > AUTO_CONNECT_INTERVAL);
     }