From 3843bf34f5c41b39565b3a0c278670db2cc11189 Mon Sep 17 00:00:00 2001
From: Nils Maier <maierman@web.de>
Date: Thu, 9 Jan 2014 04:18:44 +0100
Subject: [PATCH] Fix subscriptions race.

---
 js/services/rpc/rpc.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/js/services/rpc/rpc.js b/js/services/rpc/rpc.js
index 3c6142b..7e21e95 100644
--- a/js/services/rpc/rpc.js
+++ b/js/services/rpc/rpc.js
@@ -38,7 +38,11 @@ function(syscall, time, alerts, utils, rootScope, uri) {
     clearTimeout(timeout);
     timeout = null;
 
-    if (!subscriptions.length) {
+    subscriptions = _.filter(subscriptions, function(e) {
+      return !!e && e.once !== 2;
+    });
+    var subs = subscriptions.slice();
+    if (!subs.length) {
       timeout = setTimeout(update, time);
       return;
     }
@@ -48,15 +52,13 @@ function(syscall, time, alerts, utils, rootScope, uri) {
       syscall.init(currentConf);
     }
 
-    subscriptions = _.filter(subscriptions, function(e) { return !!e });
-    var params = _.map(subscriptions, function(s) {
+    var params = _.map(subs, function(s) {
       return {
         methodName: s.name,
         params: s.params && s.params.length ? s.params : undefined
       };
     });
 
-
     syscall.invoke({
       name: 'system.multicall',
       params: [params],
@@ -73,15 +75,16 @@ function(syscall, time, alerts, utils, rootScope, uri) {
 
         var cbs = [];
         _.each(data.result, function(d, i) {
-          var handle = subscriptions[i];
+          var handle = subs[i];
           if (handle) {
             if (d.code) {
+              console.error(handle, d);
               alerts.addAlert(d.message, 'error');
             }
             // run them later as the cb itself can mutate the subscriptions
             cbs.push({cb: handle.cb, data: d});
             if (handle.once) {
-              subscriptions[i] = null;
+              handle.once = 2;
             }
           }
         });