From 4f2a77976965f19640416afca24367d3037820b8 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Mon, 24 Apr 2017 20:51:02 -0700
Subject: JSONDB performance improvements, threading fix.

---
 node/Node.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'node')

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 *))
-- 
cgit v1.2.3