Changed the log:normal config directive to a list like the other log values, and fixed a potential crash from rehashing while sending mail

2 files changed, 4 insertions, 5 deletions

diff --git a/include/logger.h b/include/logger.h
index 518e2114f..6d134c227 100644
--- a/include/logger.h
+++ b/include/logger.h
@@ -78,11 +78,11 @@ class CoreExport LogInfo
 	std::list<Anope::string> Servers;
 	std::list<Anope::string> Users;
 	std::list<Anope::string> Channels;
-	bool Normal;
+	std::list<Anope::string> Normal;
 	bool RawIO;
 	bool Debug;
 
-	LogInfo(int logage, bool inhabit, bool normal, bool rawio, bool debug);
+	LogInfo(int logage, bool inhabit, bool rawio, bool debug);
 
 	~LogInfo();
 
diff --git a/include/mail.h b/include/mail.h
index 826f48253..c62bfb3be 100644
--- a/include/mail.h
+++ b/include/mail.h
@@ -15,12 +15,11 @@ class MailThread : public Thread
 	Anope::string Addr;
 	Anope::string Subject;
 	Anope::string Message;
+	bool DontQuoteAddresses;
 
 	bool Success;
  public:
-	MailThread(const Anope::string &mailto, const Anope::string &addr, const Anope::string &subject, const Anope::string &message) : Thread(), MailTo(mailto), Addr(addr), Subject(subject), Message(message), Success(false)
-	{
-	}
+	MailThread(const Anope::string &mailto, const Anope::string &addr, const Anope::string &subject, const Anope::string &message);
 
 	~MailThread();