Merge pull request #2851 from MetaMask/i2812-seedworderrorfix

Fix condition where failing seed word checks would infinite-spin future attempts.

1 files changed, 9 insertions, 4 deletions

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 1b13f6567..66738db51 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -536,10 +536,15 @@ module.exports = class MetamaskController extends EventEmitter {
 
   async createNewVaultAndRestore (password, seed) {
     const release = await this.createVaultMutex.acquire()
-    const vault = await this.keyringController.createNewVaultAndRestore(password, seed)
-    this.selectFirstIdentity(vault)
-    release()
-    return vault
+    try {
+      const vault = await this.keyringController.createNewVaultAndRestore(password, seed)
+      this.selectFirstIdentity(vault)
+      release()
+      return vault
+    } catch (err) {
+      release()
+      throw err
+    }
   }
 
   selectFirstIdentity (vault) {