diff options
| author | Adam <Adam@anope.org> | 2010-10-02 16:43:24 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2010-10-02 16:43:24 -0400 |
| commit | 0d684191e99a689c80560018dd52e6d8fd5dc549 (patch) | |
| tree | bb8fb268ec4c8f5e51b2c3fe8a224d23ee07c914 | |
| parent | 3499edc4271d3241eda5ee0a7d55254efa6f2663 (diff) | |
Made os_news send news notices from NickServ if global is disabled
| -rw-r--r-- | modules/core/os_news.cpp | 2 | ||||
| -rw-r--r-- | src/users.cpp | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/modules/core/os_news.cpp b/modules/core/os_news.cpp index 878e286e6..237d5c66b 100644 --- a/modules/core/os_news.cpp +++ b/modules/core/os_news.cpp @@ -95,7 +95,7 @@ static void DisplayNews(User *u, NewsType Type) if (Type == NEWS_RANDOM && i == current_news) continue; - u->SendMessage(Global, msg, do_strftime(News[i]->time).c_str(), News[i]->Text.c_str()); + u->SendMessage(Global ? Global : NickServ, msg, do_strftime(News[i]->time).c_str(), News[i]->Text.c_str()); ++displayed; diff --git a/src/users.cpp b/src/users.cpp index b89e6c271..bf2b1b85a 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -245,6 +245,12 @@ void User::SendMessage(const Anope::string &source, const Anope::string &msg) co void User::SendMessage(BotInfo *source, LanguageString message, ...) const { + if (!source) + { + Log(LOG_DEBUG) << "Tried to send message " << message << " with nonexistant source!"; + return; + } + Anope::string m = GetString(this, message); if (Config->UseStrictPrivMsg) |