tMerge pull request #540 from grnbrg/master - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit ca4756fba1480b2964d966040bd79b2767a795d1
DIR parent 9be063dfd3d4d105a18617848723eabf01364490
HTML Author: ThomasV <thomasv1@gmx.de>
Date: Sat, 11 Jan 2014 21:49:06 -0800
Merge pull request #540 from grnbrg/master
Remove the ability to "Send From" a frozen address.
Diffstat:
M gui/qt/main_window.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -1170,7 +1170,8 @@ class ElectrumWindow(QMainWindow):
if any(addr in self.wallet.frozen_addresses for addr in addrs):
menu.addAction(_("Unfreeze"), lambda: self.set_addrs_frozen(addrs, False))
- menu.addAction(_("Send From"), lambda: self.send_from_addresses(addrs))
+ if any(addr not in self.wallet.frozen_addresses for addr in addrs):
+ menu.addAction(_("Send From"), lambda: self.send_from_addresses(addrs))
run_hook('receive_menu', menu, addrs)
menu.exec_(self.receive_list.viewport().mapToGlobal(position))