From 6a0e4418f4c41dfb687de80773b4e4d45dc2e12b Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 20 Mar 2013 11:03:02 -0500 Subject: Check that channels still exist before nulling their ci pointer in channelinfos destructor Change the persist setting on a channel to mean only that it is being enforced ircd-side --- src/regchannel.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/regchannel.cpp b/src/regchannel.cpp index acfe5cf91..c4c02ad0e 100644 --- a/src/regchannel.cpp +++ b/src/regchannel.cpp @@ -368,7 +368,9 @@ ChannelInfo::~ChannelInfo() { if (this->bi && this->c->FindUser(this->bi)) this->bi->Part(this->c); - this->c->ci = NULL; + /* Parting the service bot can cause the channel to go away */ + if (this->c) + this->c->ci = NULL; } RegisteredChannelList->erase(this->name); -- cgit