highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-12-12 13:43:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3488

Browse Source 
2102ab9 ui: Fix GUI initialization order (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan
2014-01-10 11:39:34 +01:00
parent 5c72e3df3c 2102ab9f5c
commit 5b45bf400e
4 changed files with 80 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/qt/paymentserver.cpp
View File

@@ -180,10 +180,8 @@ void PaymentServer::LoadRootCAs(X509_STORE* _store)
// and the items in savedPaymentRequest will be handled
// when uiReady() is called.
//
bool PaymentServer::ipcSendCommandLine(int argc, char* argv[])
bool PaymentServer::ipcParseCommandLine(int argc, char* argv[])
{
bool fResult = false;
for (int i = 1; i < argc; i++)
{
QString arg(argv[i]);
@@ -226,7 +224,18 @@ bool PaymentServer::ipcSendCommandLine(int argc, char* argv[])
qDebug() << "PaymentServer::ipcSendCommandLine : Payment request file does not exist: " << arg;
}
}
return true;
}
//
// Sending to the server is done synchronously, at startup.
// If the server isn't already running, startup continues,
// and the items in savedPaymentRequest will be handled
// when uiReady() is called.
//
bool PaymentServer::ipcSendCommandLine()
{
bool fResult = false;
foreach (const QString& r, savedPaymentRequests)
{
QLocalSocket* socket = new QLocalSocket();