electrum

commit c4d10f6d639707591c43e9c8c21465c503f01fbe
parent ed48588d8ad612da7d1c5ead2a1b11c02f5842b6
Author: ThomasV <thomasv@gitorious>
Date:   Mon,  2 Jun 2014 22:25:32 +0200

fix: wizard 2of2 (cosigning key)

Diffstat:
M
gui/qt/installwizard.py
 | 
7
++++---

1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py
@@ -436,10 +436,11 @@ class InstallWizard(QDialog):
 
         if action == 'create_2of2_2':
             xpub_hot = wallet.master_public_keys.get("m/")
-            xpub = self.multi_mpk_dialog(xpub_hot, 1)
-            if not xpub:
+            r = self.multi_mpk_dialog(xpub_hot, 1)
+            if not r:
                 return
-            wallet.add_master_public_key("cold/", xpub)
+            xpub_cold = r[0]
+            wallet.add_master_public_key("cold/", xpub_cold)
             wallet.create_account()
             self.waiting_dialog(wallet.synchronize)