fix disable

TrustyFund · Apr 2, 2018 · acbb8d0 · acbb8d0
1 parent 1006d46
commit acbb8d0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/actions/connection.js b/src/actions/connection.js
@@ -14,7 +14,6 @@ export const initConnection = ({ commit, getters }, changeNode) => {
     if (status === 'error' || status === 'closed') {
       commit(types.WS_DISCONNECTED);
       active = false;
-      API.ChainListener.disable();
       await API.Connection.disconnect();
       initConnection({ commit, getters }, true);
     }

diff --git a/src/services/api/chain-listener.js b/src/services/api/chain-listener.js
@@ -9,13 +9,13 @@ class ChainListener {
     this._subscribers = [];
     this._enabled = false;
   }
-  enable() {
-    if (this._enabled) this.disable();
+  async enable() {
+    if (this._enabled) await this.disable();
     Apis.instance().db_api().exec('set_subscribe_callback', [this._mainCallback.bind(this), true]);
     this._enabled = true;
   }
   disable() {
-    Apis.instance().db_api().exec('cancel_all_subscriptions', []).then(() => {
+    return Apis.instance().db_api().exec('cancel_all_subscriptions', []).then(() => {
       this._enabled = false;
     });
   }