From 21038843ea9ab846b1afaf796b3b33b03da6d191 Mon Sep 17 00:00:00 2001
From: Neil Booth <kyuupichan@gmail.com>
Date: Tue, 5 Jan 2016 21:13:12 +0900
Subject: [PATCH] Fix MultiSig wallet creation.

Fixes #1603
---
 lib/wallet.py | 5 -----
 lib/wizard.py | 6 ++++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/wallet.py b/lib/wallet.py
index 589b775c..8968e4c6 100644
--- a/lib/wallet.py
+++ b/lib/wallet.py
@@ -1817,11 +1817,6 @@ class Multisig_Wallet(BIP32_Wallet, Mnemonic):
     def get_master_public_keys(self):
         return self.master_public_keys
 
-    def get_action(self):
-        for i in range(self.n):
-            if self.master_public_keys.get("x%d/"%(i+1)) is None:
-                return 'create_seed' if i == 0 else 'add_cosigners'
-
 
 class OldWallet(Deterministic_Wallet):
     wallet_type = 'old'
diff --git a/lib/wizard.py b/lib/wizard.py
index d462cb17..7b83790b 100644
--- a/lib/wizard.py
+++ b/lib/wizard.py
@@ -19,7 +19,7 @@
 from electrum import WalletStorage
 from electrum.plugins import run_hook
 from util import PrintError
-from wallet import Wallet
+from wallet import Wallet, Multisig_Wallet
 from i18n import _
 
 MSG_GENERATING_WAIT = _("Electrum is generating your addresses, please wait...")
@@ -270,12 +270,14 @@ class WizardBase(PrintError):
 
     def create_seed(self, wallet):
         '''The create_seed action creates a seed and then generates
-        wallet account(s).'''
+        wallet account(s) whilst we still have the password.'''
         seed = wallet.make_seed(self.language_for_seed)
         self.show_and_verify_seed(seed)
         password = self.request_password()
         wallet.add_seed(seed, password)
         wallet.create_master_keys(password)
+        if isinstance(wallet, Multisig_Wallet):
+            self.add_cosigners(wallet)
         wallet.create_main_account(password)
 
     def add_cosigners(self, wallet):