Merge pull request bitcoin#136 from presstab/multisend

presstab · web-flow · commit 53705f134c38 · 2017-04-24T11:05:53.000-06:00
[QT] Fix false flags for MultiSend notification when sending transactions …
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -1029,7 +1029,7 @@ void BitcoinGUI::closeEvent(QCloseEvent* event)
 void BitcoinGUI::incomingTransaction(const QString& date, int unit, const CAmount& amount, const QString& type, const QString& address)
 {
     // On new transaction, make an info balloon
-    message((amount) < 0 ? (fMultiSendNotify == true ? tr("Sent MultiSend transaction") : tr("Sent transaction")) : tr("Incoming transaction"),
+    message((amount) < 0 ? (pwalletMain->fMultiSendNotify == true ? tr("Sent MultiSend transaction") : tr("Sent transaction")) : tr("Incoming transaction"),
         tr("Date: %1\n"
            "Amount: %2\n"
            "Type: %3\n"
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
@@ -68,8 +68,7 @@ class BitcoinGUI : public QMainWindow
     void removeAllWallets();
 #endif // ENABLE_WALLET
     bool enableWallet;
-    bool fMultiSend;
-    bool fMultiSendNotify;
+    bool fMultiSend = false;
 
 protected:
     void changeEvent(QEvent* e);

Original file line number	Diff line number	Diff line change
`@@ -1029,7 +1029,7 @@ void BitcoinGUI::closeEvent(QCloseEvent* event)`
`1029`	`1029`	`void BitcoinGUI::incomingTransaction(const QString& date, int unit, const CAmount& amount, const QString& type, const QString& address)`
`1030`	`1030`	`{`
`1031`	`1031`	`// On new transaction, make an info balloon`
`1032`		`- message((amount) < 0 ? (fMultiSendNotify == true ? tr("Sent MultiSend transaction") : tr("Sent transaction")) : tr("Incoming transaction"),`
	`1032`	`+ message((amount) < 0 ? (pwalletMain->fMultiSendNotify == true ? tr("Sent MultiSend transaction") : tr("Sent transaction")) : tr("Incoming transaction"),`
`1033`	`1033`	`tr("Date: %1\n"`
`1034`	`1034`	`"Amount: %2\n"`
`1035`	`1035`	`"Type: %3\n"`