From cae635c3e4b0450d64d169910a6e93235f4b1563 Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@electrum.org>
Date: Fri, 26 Aug 2016 08:36:36 +0200
Subject: [PATCH] kivy: fix load_wallet bug

---
 gui/kivy/main_window.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gui/kivy/main_window.py b/gui/kivy/main_window.py
index b29c8592..6c69162e 100644
--- a/gui/kivy/main_window.py
+++ b/gui/kivy/main_window.py
@@ -418,7 +418,8 @@ class ElectrumWindow(App):
         if not path:
             return
         wallet = self.daemon.load_wallet(path)
-        if wallet:
+        if wallet != self.wallet:
+            self.stop_wallet()
             self.load_wallet(wallet)
             self.on_resume()
         else:
@@ -535,9 +536,6 @@ class ElectrumWindow(App):
 
     @profiler
     def load_wallet(self, wallet):
-        print "load wallet", wallet.storage.path
-
-        self.stop_wallet()
         self.wallet = wallet
         self.current_account = self.wallet.storage.get('current_account', None)
         self.update_wallet()