dont segfault on exit (#1396)

* dont segfault on exit

* initialize m_isServiceNode earlier.

llarp/router/router.cpp

@@ -283,6 +283,8 @@ namespace llarp
 
     _nodedb = nodedb;
 
+    m_isServiceNode = conf.router.m_isRelay;
+
     if (whitelistRouters)
     {
       m_lokidRpcClient->ConnectAsync(lokidRPCAddr);
@@ -455,8 +457,6 @@ namespace llarp
     if (usingSNSeed)
       ident_keyfile = conf.lokid.ident_keyfile;
 
-    m_isServiceNode = conf.router.m_isRelay;
-
     networkConfig = conf.network;
 
     /// build a set of  strictConnectPubkeys (
@@ -1120,6 +1120,7 @@ namespace llarp
   Router::AfterStopLinks()
   {
     Close();
+    m_lmq.reset();
   }
 
   void
@@ -1128,7 +1129,6 @@ namespace llarp
     StopLinks();
     nodedb()->AsyncFlushToDisk();
     _logic->call_later(200ms, std::bind(&Router::AfterStopLinks, this));
-    m_lmq.reset();
   }
 
   void
@@ -1240,6 +1240,18 @@ namespace llarp
     return true;
   }
 
+  void
+  Router::QueueWork(std::function<void(void)> func)
+  {
+    m_lmq->job(std::move(func));
+  }
+
+  void
+  Router::QueueDiskIO(std::function<void(void)> func)
+  {
+    m_lmq->job(std::move(func), m_DiskThread);
+  }
+
   bool
   Router::HasClientExit() const
   {

llarp/router/router.hpp

@@ -170,16 +170,10 @@ namespace llarp
     }
 
     void
-    QueueWork(std::function<void(void)> func) override
+    QueueWork(std::function<void(void)> func) override;
-    {
-      m_lmq->job(std::move(func));
-    }
 
     void
-    QueueDiskIO(std::function<void(void)> func) override
+    QueueDiskIO(std::function<void(void)> func) override;
-    {
-      m_lmq->job(std::move(func), m_DiskThread);
-    }
 
     IpAddress _ourAddress;