aboutsummaryrefslogtreecommitdiff
path: root/src/qt/bitcoingui.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2013-10-25 06:43:19 -0700
committerWladimir J. van der Laan <[email protected]>2013-10-25 06:43:19 -0700
commit0d09b3e8b0218169ab7ad2aa787c43ea11bc7060 (patch)
treeca452e91451b9c531fc0a84e0a578093a6080792 /src/qt/bitcoingui.cpp
parentqt: ReceiveCoinsDialog and SendCoinsDialog should not take a gui object (diff)
parentallow emit message() in sendcoinsdialog and walletview (diff)
downloaddiscoin-0d09b3e8b0218169ab7ad2aa787c43ea11bc7060.tar.xz
discoin-0d09b3e8b0218169ab7ad2aa787c43ea11bc7060.zip
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.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 26e823705..eadda586a 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)