diff options
| author | Adam <Adam@anope.org> | 2013-09-20 15:21:32 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2013-09-20 15:21:32 -0400 |
| commit | 8641b995c43593289dc4e66cbf980069b80d6d6b (patch) | |
| tree | 07b4c53e9b69300b7d24ab45988412d05ca214dd /modules/commands/ms_cancel.cpp | |
| parent | b880240d727a4375522851daea0abf468f588a78 (diff) | |
Merge the two memo del events into one. Since they had the same name it was confusing the event system
Diffstat (limited to 'modules/commands/ms_cancel.cpp')
| -rw-r--r-- | modules/commands/ms_cancel.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/modules/commands/ms_cancel.cpp b/modules/commands/ms_cancel.cpp index 18ddcfa09..5b6b0b23f 100644 --- a/modules/commands/ms_cancel.cpp +++ b/modules/commands/ms_cancel.cpp @@ -40,10 +40,7 @@ class CommandMSCancel : public Command for (int i = mi->memos->size() - 1; i >= 0; --i) if (mi->GetMemo(i)->unread && source.nc->display.equals_ci(mi->GetMemo(i)->sender)) { - if (ischan) - FOREACH_MOD(OnMemoDel, (ci, mi, mi->GetMemo(i))); - else - FOREACH_MOD(OnMemoDel, (na->nc, mi, mi->GetMemo(i))); + FOREACH_MOD(OnMemoDel, (ischan ? ci->name : na->nc->display, mi, mi->GetMemo(i))); mi->Del(i); source.Reply(_("Last memo to \002%s\002 has been cancelled."), nname.c_str()); return; |