diff options
| author | Adam <Adam@anope.org> | 2012-03-27 19:14:55 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2012-03-27 19:14:55 -0400 |
| commit | 12a6a27b52a3520c1f41a1d4d6b8e3ef25fafb23 (patch) | |
| tree | 31734df3f40e076b2ff0a21297109f90e3260146 /modules | |
| parent | 31a0e673b2028f3dad67cd1e6f0f5410d0dde56d (diff) | |
| parent | 8d0b4a1bf53788494fe0531dd62b4dd2ee655e9b (diff) | |
Merge branch '1.9' of anope.git.sf.net:/gitroot/anope/anope into 1.9
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/commands/cs_seen.cpp | 3 | ||||
| -rw-r--r-- | modules/commands/ns_ajoin.cpp | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/modules/commands/cs_seen.cpp b/modules/commands/cs_seen.cpp index 8466cf82c..0143f50d6 100644 --- a/modules/commands/cs_seen.cpp +++ b/modules/commands/cs_seen.cpp @@ -346,7 +346,8 @@ class CSSeen : public Module void OnUserConnect(dynamic_reference<User> &u, bool &exempt) anope_override { - UpdateUser(u, NEW, u->nick, "", "", ""); + if (u) + UpdateUser(u, NEW, u->nick, "", "", ""); } void OnUserNickChange(User *u, const Anope::string &oldnick) anope_override diff --git a/modules/commands/ns_ajoin.cpp b/modules/commands/ns_ajoin.cpp index 03b710356..2e64ebfe0 100644 --- a/modules/commands/ns_ajoin.cpp +++ b/modules/commands/ns_ajoin.cpp @@ -31,7 +31,13 @@ struct AJoinList : std::vector<std::pair<Anope::string, Anope::string> >, Extens sd["nc"] << this->nc->display; Anope::string channels; for (unsigned i = 0; i < this->size(); ++i) - channels += this->at(i).first + "," + this->at(i).second; + { + channels += this->at(i).first; + if (!this->at(i).second.empty()) + channels += "," + this->at(i).second; + if (i+1 < this->size()) + channels += " "; + } sd["channels"] << channels; return sd; |