diff options
| author | Adam <Adam@anope.org> | 2013-03-20 11:03:02 -0500 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2013-03-20 11:39:16 -0500 |
| commit | 6a0e4418f4c41dfb687de80773b4e4d45dc2e12b (patch) | |
| tree | f713464980b3c28b17d473e32eb7df612468d94b /include/channels.h | |
| parent | 731912f01eb14d811575c492dc64b60084bd412c (diff) | |
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
Diffstat (limited to 'include/channels.h')
| -rw-r--r-- | include/channels.h | 17 |
1 files changed, 6 insertions, 11 deletions
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<ChannelInfo> ci; /* When the channel was created */ time_t creation_time; - std::set<ChannelFlag> flags; /* Users in the channel */ typedef std::list<ChanUserContainer *> ChanUserList; |