From ea1af3d536e39c3e81864f4dd184fef7c6c6a797 Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@gitorious>
Date: Tue, 3 Mar 2015 10:55:11 +0100
Subject: [PATCH] fix password bug in wallet upgrade

---
 gui/qt/main_window.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
index a66d63a8..74324f43 100644
--- a/gui/qt/main_window.py
+++ b/gui/qt/main_window.py
@@ -245,7 +245,7 @@ class ElectrumWindow(QMainWindow):
     def update_wallet_format(self):
         # convert old-format imported keys
         if self.wallet.imported_keys:
-            password = self.password_dialog(_("Please enter your password in order to update imported keys"))
+            password = self.password_dialog(_("Please enter your password in order to update imported keys")) if self.wallet.use_encryption else None
             try:
                 self.wallet.convert_imported_keys(password)
             except: