Merge pull request #540 from grnbrg/master

Remove the ability to "Send From" a frozen address.
This commit is contained in:
ThomasV 2014-01-11 21:49:06 -08:00
commit ca4756fba1
1 changed files with 2 additions and 1 deletions

View File

@ -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))