Merge branch 'soon' into staging

5 years ago · c418f77e48
parent cb6b4a8eb3 8084343705
commit c418f77e48
1 changed files with 6 additions and 1 deletions
--- a/rpc.js
+++ b/rpc.js
@ -762,7 +762,12 @@ var resetUserPins = function (Env, publicKey, channelList, cb) {
                    pins[channel] = true;
                });

-                var oldChannels = Object.keys(session.channels);
+                var oldChannels;
+                if (session.channels && typeof(session.channels) === 'object') {
+                    oldChannels = Object.keys(session.channels);
+                } else {
+                    oldChannels = [];
+                }
                removePinned(Env, publicKey, oldChannels, () => {
                    addPinned(Env, publicKey, channelList, ()=>{});
                });