tperform easy test first (lazy evaluation) - electrum - Electrum Bitcoin wallet HTML git clone https://git.parazyd.org/electrum DIR Log DIR Files DIR Refs DIR Submodules --- DIR commit 81c00956e86fb0649fc03ff72545e12702222619 DIR parent 5f4bcb420b652b38eaa94755338b5d3f1efa69be HTML Author: ThomasV <thomasv@gitorious> Date: Sat, 13 Sep 2014 15:23:35 +0200 perform easy test first (lazy evaluation) Diffstat: M gui/qt/main_window.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py t@@ -1091,7 +1091,7 @@ class ElectrumWindow(QMainWindow): self.show_message(str(e)) return - if tx.requires_fee(self.wallet.verifier) and tx.get_fee() < MIN_RELAY_TX_FEE: + if tx.get_fee() < MIN_RELAY_TX_FEE and tx.requires_fee(self.wallet.verifier): QMessageBox.warning(self, _('Error'), _("This transaction requires a higher fee, or it will not be propagated by the network."), _('OK')) return