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 --- include/channels.h | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'include') diff --git a/include/channels.h b/include/channels.h index 3cf337e65..18ef65a7c 100644 --- a/include/channels.h +++ b/include/channels.h @@ -30,16 +30,12 @@ struct ChanUserContainer : public Extensible ChanUserContainer(User *u, Channel *c) : user(u), chan(c) { } }; -enum ChannelFlag -{ - /* ChanServ is currently holding the channel */ - CH_INHABIT, - /* Channel still exists when emptied */ - CH_PERSIST, - /* If set the channel is syncing users (channel was just created) and it should not be deleted */ - CH_SYNCING -}; - +/* Possible flags: + * + * INHABIT - ChanServ is currently holding the channel + * PERSIST - Channel still exists when emptied (IRCd enforced) + * SYNCING - Channel is syncing users (channel was just created) and it should not be deleted + */ class CoreExport Channel : public Base, public Extensible { public: @@ -56,7 +52,6 @@ class CoreExport Channel : public Base, public Extensible Serialize::Reference ci; /* When the channel was created */ time_t creation_time; - std::set flags; /* Users in the channel */ typedef std::list ChanUserList; -- cgit