Rewrote the config reader to better handle invalid configs.

This prevents Anope from exploding when /os reload has errors.

1 files changed, 9 insertions, 9 deletions

diff --git a/modules/core/bs_assign.cpp b/modules/core/bs_assign.cpp
index ab24b1f39..b1242c857 100644
--- a/modules/core/bs_assign.cpp
+++ b/modules/core/bs_assign.cpp
@@ -29,13 +29,13 @@ class CommandBSAssign : public Command
 
 		if (readonly)
 		{
-			notice_lang(Config.s_BotServ, u, BOT_ASSIGN_READONLY);
+			notice_lang(Config->s_BotServ, u, BOT_ASSIGN_READONLY);
 			return MOD_CONT;
 		}
 
 		if (!(bi = findbot(nick)))
 		{
-			notice_lang(Config.s_BotServ, u, BOT_DOES_NOT_EXIST, nick.c_str());
+			notice_lang(Config->s_BotServ, u, BOT_DOES_NOT_EXIST, nick.c_str());
 			return MOD_CONT;
 		}
 
@@ -43,41 +43,41 @@ class CommandBSAssign : public Command
 
 		if (ci->botflags.HasFlag(BS_NOBOT) || (!check_access(u, ci, CA_ASSIGN) && !u->Account()->HasPriv("botserv/administration")))
 		{
-			notice_lang(Config.s_BotServ, u, ACCESS_DENIED);
+			notice_lang(Config->s_BotServ, u, ACCESS_DENIED);
 			return MOD_CONT;
 		}
 
 		if (bi->HasFlag(BI_PRIVATE) && !u->Account()->HasCommand("botserv/assign/private"))
 		{
-			notice_lang(Config.s_BotServ, u, ACCESS_DENIED);
+			notice_lang(Config->s_BotServ, u, ACCESS_DENIED);
 			return MOD_CONT;
 		}
 
 		if (ci->bi && nick.equals_ci(ci->bi->nick))
 		{
-			notice_lang(Config.s_BotServ, u, BOT_ASSIGN_ALREADY, ci->bi->nick.c_str(), chan.c_str());
+			notice_lang(Config->s_BotServ, u, BOT_ASSIGN_ALREADY, ci->bi->nick.c_str(), chan.c_str());
 			return MOD_CONT;
 		}
 
 		bi->Assign(u, ci);
-		notice_lang(Config.s_BotServ, u, BOT_ASSIGN_ASSIGNED, bi->nick.c_str(), ci->name.c_str());
+		notice_lang(Config->s_BotServ, u, BOT_ASSIGN_ASSIGNED, bi->nick.c_str(), ci->name.c_str());
 		return MOD_CONT;
 	}
 
 	bool OnHelp(User *u, const Anope::string &subcommand)
 	{
-		notice_help(Config.s_BotServ, u, BOT_HELP_ASSIGN);
+		notice_help(Config->s_BotServ, u, BOT_HELP_ASSIGN);
 		return true;
 	}
 
 	void OnSyntaxError(User *u, const Anope::string &subcommand)
 	{
-		syntax_error(Config.s_BotServ, u, "ASSIGN", BOT_ASSIGN_SYNTAX);
+		syntax_error(Config->s_BotServ, u, "ASSIGN", BOT_ASSIGN_SYNTAX);
 	}
 
 	void OnServHelp(User *u)
 	{
-		notice_lang(Config.s_BotServ, u, BOT_HELP_CMD_ASSIGN);
+		notice_lang(Config->s_BotServ, u, BOT_HELP_CMD_ASSIGN);
 	}
 };