From 555f7653c54f6d44f89db52b9d47ab20f66775f5 Mon Sep 17 00:00:00 2001
From: Torbjorn Tyridal <ttyridal@users.noreply.github.com>
Date: Tue, 9 Aug 2016 12:32:44 +0200
Subject: [PATCH] notice key change accepted when not closing popup in between

---
 ext/data/main_popup.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ext/data/main_popup.js b/ext/data/main_popup.js
index 6b0cf41..313a36b 100644
--- a/ext/data/main_popup.js
+++ b/ext/data/main_popup.js
@@ -356,10 +356,11 @@ document.querySelector('#mainPopup').addEventListener('click', function(ev) {
         ui.toggle('#burgermenu');
     }
     else if (ev.target.id === 'change_keyid_ok') {
+        session_store.key_id = mpw_session.key_id();
         addon.port.emit('store_update', {
             username: session_store.username,
             masterkey: session_store.masterkey,
-            key_id: mpw_session.key_id(),
+            key_id: session_store.key_id,
             force_update: true
         });
         ui.user_info("Password for " + ui.sitename() + " copied to clipboard");