From 8641b995c43593289dc4e66cbf980069b80d6d6b Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 20 Sep 2013 15:21:32 -0400 Subject: Merge the two memo del events into one. Since they had the same name it was confusing the event system --- modules/commands/ms_cancel.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'modules/commands/ms_cancel.cpp') 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; -- cgit