diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-04-24 20:51:02 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-04-24 20:51:02 -0700 |
| commit | 4f2a77976965f19640416afca24367d3037820b8 (patch) | |
| tree | e68402e6564180cfe39b1d77ffc51c87120b7dd3 /node | |
| parent | cafbe44dde55e57115cc654610172556dff19bec (diff) | |
| download | infinitytier-4f2a77976965f19640416afca24367d3037820b8.tar.gz infinitytier-4f2a77976965f19640416afca24367d3037820b8.zip | |
JSONDB performance improvements, threading fix.
Diffstat (limited to 'node')
| -rw-r--r-- | node/Node.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/node/Node.cpp b/node/Node.cpp index 2b3f7996..ccbe9411 100644 --- a/node/Node.cpp +++ b/node/Node.cpp @@ -490,7 +490,8 @@ int Node::sendUserMessage(void *tptr,uint64_t dest,uint64_t typeId,const void *d void Node::setNetconfMaster(void *networkControllerInstance) { RR->localNetworkController = reinterpret_cast<NetworkController *>(networkControllerInstance); - RR->localNetworkController->init(RR->identity,this); + if (networkControllerInstance) + RR->localNetworkController->init(RR->identity,this); } ZT_ResultCode Node::circuitTestBegin(void *tptr,ZT_CircuitTest *test,void (*reportCallback)(ZT_Node *,ZT_CircuitTest *,const ZT_CircuitTestReport *)) |