solve deadlock during restore

2012-11-04 20:53:27 +01:00
parent 5bb441ce37
commit 39a85767a3
4 changed files with 28 additions and 24 deletions
--- a/11
+++ b/11
@@ -193,6 +193,10 @@ if __name__ == '__main__':
        
        gui = gui.ElectrumGui(wallet, config)
        interface.register_callback('peers', gui.server_list_changed)
+
+        verifier = WalletVerifier(interface, config)
+        wallet.set_verifier(verifier)
+
        try:
            found = config.wallet_file_exists
            if not found:
@@ -208,12 +212,7 @@ if __name__ == '__main__':
        if not found:
            exit(1)

-        verifier = WalletVerifier(interface, config)
-        wallet.set_verifier(verifier)
-        if not config.get('disable_spv'): 
-            verifier.start()
-        else:
-            print "warning: SPV is disabled"
+        verifier.start()

        gui.main(url)
        wallet.save()