aboutsummaryrefslogtreecommitdiff
path: root/src/qt/bitcoin.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/bitcoin.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/bitcoin.cpp')
-rw-r--r--src/qt/bitcoin.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 2fa7979eae..e435972686 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -308,7 +308,6 @@ int main(int argc, char *argv[])
PaymentServer::LoadRootCAs();
paymentServer->setOptionsModel(&optionsModel);
- paymentServer->initNetManager();
if (splashref)
splash.finish(&window);