From bfcc3006703924fade80cbf41b4d682481618690 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Tue, 12 Feb 2008 13:49:39 +0000
Subject: [PATCH] 2008-02-12  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot
 com>

	Fixed segmentation fault bug when exiting if dht is disabled.
	* src/RequestGroup.cc
---
 ChangeLog           | 5 +++++
 src/RequestGroup.cc | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0c188de9..58dda385 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-12  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+
+	Fixed segmentation fault bug when exiting if dht is disabled.
+	* src/RequestGroup.cc
+
 2008-02-12  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	Fixed typo in log message and define the message in message.h
diff --git a/src/RequestGroup.cc b/src/RequestGroup.cc
index 08488011..3141edb4 100644
--- a/src/RequestGroup.cc
+++ b/src/RequestGroup.cc
@@ -609,7 +609,9 @@ void RequestGroup::releaseRuntimeResource()
        btContextInReg->getOwnerRequestGroup()->getGID() ==
 	btContext->getOwnerRequestGroup()->getGID()) {
       BtRegistry::unregister(btContext->getInfoHashAsString());
-      DHTRegistry::_peerAnnounceStorage->removePeerAnnounce(btContext);
+      if(!DHTRegistry::_peerAnnounceStorage.isNull()) {
+	DHTRegistry::_peerAnnounceStorage->removePeerAnnounce(btContext);
+      }
     }
   }
 #endif // ENABLE_BITTORRENT