aboutsummaryrefslogtreecommitdiff
path: root/src/qt/paymentserver.cpp
diff options
context:
space:
mode:
authorPhilip Kaufmann <phil.kaufmann@t-online.de>2013-10-30 11:30:53 +0100
committerPhilip Kaufmann <phil.kaufmann@t-online.de>2013-11-11 14:20:00 +0100
commit7634e0d8de4aac80a3a84dd2438f24f98670d44d (patch)
tree7f109129df59a9395fd8e5c0a07cedfb58daa7b5 /src/qt/paymentserver.cpp
parent59be91ae1e8da1e679adbb7c84e8bca749daa8a7 (diff)
[Qt] paymentserver: start netManager in uiReady()
- remove explicit init of netManager as this is done in the constructor anyway - move initNetManager() call to uiReady(), which removes an assert() and allows us to use message() in initNetManager() (currently unused but could be necessary because of proxy related messages) - make initNetManager() private - update paymentservertests.cpp
Diffstat (limited to 'src/qt/paymentserver.cpp')
-rw-r--r--src/qt/paymentserver.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
index cb6291c35d..34da0f90ec 100644
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -341,7 +341,7 @@ void PaymentServer::initNetManager()
void PaymentServer::uiReady()
{
- assert(netManager != NULL); // Must call initNetManager before uiReady()
+ initNetManager();
saveURIs = false;
foreach (const QString& s, savedPaymentRequests)