summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/regchannel.h3
-rw-r--r--src/regchannel.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/include/regchannel.h b/include/regchannel.h
index 0f5bb022a..12ef308b4 100644
--- a/include/regchannel.h
+++ b/include/regchannel.h
@@ -163,7 +163,8 @@ struct CoreExport LogSetting : Serializable
static Serializable* unserialize(Serializable *obj, Serialize::Data &);
};
-class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag, CI_END>, public Serializable
+/* It matters that Base is here before Extensible (it is inherited by Serializable) */
+class CoreExport ChannelInfo : public Serializable, public Extensible, public Flags<ChannelInfoFlag, CI_END>
{
private:
serialize_obj<NickCore> founder; /* Channel founder */
diff --git a/src/regchannel.cpp b/src/regchannel.cpp
index ccb2235b3..c507a4277 100644
--- a/src/regchannel.cpp
+++ b/src/regchannel.cpp
@@ -226,7 +226,7 @@ Serializable* LogSetting::unserialize(Serializable *obj, Serialize::Data &data)
/** Default constructor
* @param chname The channel name
*/
-ChannelInfo::ChannelInfo(const Anope::string &chname) : Flags<ChannelInfoFlag, CI_END>(ChannelInfoFlagStrings), Serializable("ChannelInfo"),
+ChannelInfo::ChannelInfo(const Anope::string &chname) : Serializable("ChannelInfo"), Flags<ChannelInfoFlag, CI_END>(ChannelInfoFlagStrings),
access("ChanAccess"), akick("AutoKick"),
badwords("BadWord"), mode_locks("ModeLock"), log_settings("LogSetting"), botflags(BotServFlagStrings)
{