diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-10-25 06:43:19 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-10-25 06:43:19 -0700 |
| commit | 0d09b3e8b0218169ab7ad2aa787c43ea11bc7060 (patch) | |
| tree | ca452e91451b9c531fc0a84e0a578093a6080792 /src/qt/bitcoingui.cpp | |
| parent | 3b7028201544e647257b3bf5e358f5ae335f7897 (diff) | |
| parent | 2384a2864b6a0b29eec6410057aefe1fd8e7e585 (diff) | |
| download | bitcoin-0d09b3e8b0218169ab7ad2aa787c43ea11bc7060.tar.xz | |
Merge pull request #3144 from Diapolo/message_sendcoinsdialog
allow emit message() in sendcoinsdialog and walletview
Diffstat (limited to 'src/qt/bitcoingui.cpp')
| -rw-r--r-- | src/qt/bitcoingui.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 26e823705c..eadda586a0 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -752,9 +752,17 @@ bool BitcoinGUI::eventFilter(QObject *object, QEvent *event) return QMainWindow::eventFilter(object, event); } -void BitcoinGUI::handlePaymentRequest(const SendCoinsRecipient& recipient) +bool BitcoinGUI::handlePaymentRequest(const SendCoinsRecipient& recipient) { - walletFrame->handlePaymentRequest(recipient); + // URI has to be valid + if (walletFrame->handlePaymentRequest(recipient)) + { + showNormalIfMinimized(); + gotoSendCoinsPage(); + return true; + } + else + return false; } void BitcoinGUI::setEncryptionStatus(int status) |