Ensure we close the active connection when opening another in the client

diff --git a/trivabble.js b/trivabble.js
index 3dc1dbae872bdd43f1abdcc3a4b73b9c2b13dc59..ff14bd9ad57b8a57159811a974d3149f459458f1 100644 (file)
--- a/trivabble.js
+++ b/trivabble.js
@@ -813,7 +813,7 @@
         }
     }
 
-    function stopConnection() {
+    function closeConnections() {
         if (eventSource) {
             eventSource.onerror = null;
             eventSource.close();
@@ -826,6 +826,10 @@
             webSocket.close();
             webSocket = null;
         }
+    }
+
+    function stopConnection() {
+        closeConnections();
 
         if (retryPollingTimeout) {
             clearTimeout(retryPollingTimeout);
@@ -882,6 +886,7 @@
 
     function pollServerWithEventSource() {
         if (ENABLE_EVENT_SOURCE && window.EventSource) {
+            closeConnections();
             eventSource = new EventSource("/:trivabble/sse/" + JSON.stringify(cmdsWithContext()));
             bindConnectionEvents(eventSource);
             return;
@@ -892,6 +897,7 @@
 
     function pollServerWithWebSocket() {
         if (ENABLE_WEBSOCKETS && !blacklistWebsockets && window.WebSocket) {
+            closeConnections();
             webSocket = new WebSocket(
                 (window.location.protocol === "http:" ? "ws://" : "wss://") +
                 window.location.host +