git://git.novaco.in
/
electrum-nvc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
5a4822a
)
don't ask pw if wallet is unencrypted
author
ThomasV
<thomasv@gitorious>
Sat, 5 Jan 2013 21:13:41 +0000 (22:13 +0100)
committer
ThomasV
<thomasv@gitorious>
Sat, 5 Jan 2013 21:13:41 +0000 (22:13 +0100)
lib/gui_qt.py
patch
|
blob
|
history
diff --git
a/lib/gui_qt.py
b/lib/gui_qt.py
index
33347cc
..
d23e8fb
100644
(file)
--- a/
lib/gui_qt.py
+++ b/
lib/gui_qt.py
@@
-1537,7
+1537,12
@@
class ElectrumWindow(QMainWindow):
text, ok = QInputDialog.getText(self, _('Import private key'), _('Key') + ':')
if not ok: return
sec = str(text)
- password = self.password_dialog()
+ if self.wallet.use_encryption:
+ password = self.password_dialog()
+ if not password:
+ return
+ else:
+ password = None
try:
addr = self.wallet.import_key(sec, password)
if not addr: