Destination: delete tunnel pool outside of dtor

Fixes one of the segfaults upon SIGINT References monero-project#342
anonimal · Sep 13, 2016 · fe270c0 · fe270c0
1 parent 81e7f17
commit fe270c0
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/client/destination.cc b/src/client/destination.cc
@@ -148,8 +148,6 @@ ClientDestination::~ClientDestination() {
     Stop();
   for (auto it : m_LeaseSetRequests)
     delete it.second;
-  if (m_Pool)
-    i2p::tunnel::tunnels.DeleteTunnelPool(m_Pool);
   if (m_DatagramDestination)
     delete m_DatagramDestination;
 }
@@ -204,6 +202,7 @@ void ClientDestination::Stop() {
     if (m_Pool) {
       m_Pool->SetLocalDestination(nullptr);
       i2p::tunnel::tunnels.StopTunnelPool(m_Pool);
+      i2p::tunnel::tunnels.DeleteTunnelPool(m_Pool);
     }
     m_Service.stop();
     if (m_Thread) {