From 822face7a3513a709277a197e27fd550b7b21954 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Tue, 22 Nov 2016 16:29:46 -0800
Subject: Fix password reference

---
 app/scripts/keyring-controller.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 4fa2b4ee8..141a1281a 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -274,8 +274,9 @@ module.exports = class KeyringController extends EventEmitter {
 
   unlockKeyrings (password) {
     const encryptedVault = this.configManager.getVault()
-    return this.encryptor.decrypt(this.password, encryptedVault)
+    return this.encryptor.decrypt(password, encryptedVault)
     .then((vault) => {
+      this.password = password
       vault.forEach(this.restoreKeyring.bind(this))
       return this.keyrings
     })
-- 
cgit v1.2.3