From a20f29bd1ff04ff3aa6e072c08e6c5684e1c1b1e Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Sun, 1 Sep 2013 02:24:47 +0000
Subject: [PATCH] * VRFS-594 - stop heartbeats in the right way - kill
 heartbeatInterval

---
 app/assets/javascripts/JamServer.js | 3 +--
 app/assets/javascripts/jamkazam.js  | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/JamServer.js b/app/assets/javascripts/JamServer.js
index 616df5c19..bfbb66425 100644
--- a/app/assets/javascripts/JamServer.js
+++ b/app/assets/javascripts/JamServer.js
@@ -52,10 +52,9 @@
         server.socket.onclose = server.onClose;
     };
 
-    server.close = function(app, in_error) {
+    server.close = function(in_error) {
         logger.log("closing websocket");
 
-        app.heartbeatActive = false; // stop future heartbeats
         server.socket.close();
 
         if(in_error) {
diff --git a/app/assets/javascripts/jamkazam.js b/app/assets/javascripts/jamkazam.js
index bc72273ed..ac241f070 100644
--- a/app/assets/javascripts/jamkazam.js
+++ b/app/assets/javascripts/jamkazam.js
@@ -66,7 +66,8 @@
                 // this logic equates to 'if we have not received a heartbeat within 2 heartbeat intervals, then get upset
                 if(new Date().getTime() - lastHeartbeatAckTime.getTime() > heartbeatMS * 2) {
                     logger.error("no heartbeat ack received from server after twice heartbeat interval. giving up");
-                    context.JK.JamServer.close(app, true);
+                    clearInterval(heartbeatInterval); // stop future heartbeats
+                    context.JK.JamServer.close(true);
 
                 }
             }