diff options
author | Gluzskiy Alexandr <sss123next@list.ru> | 2010-07-19 21:14:42 +0300 |
---|---|---|
committer | Gluzskiy Alexandr <sss123next@list.ru> | 2010-07-19 21:14:42 +0300 |
commit | 62ca8b07d9cf4f0cfdaa29099d6fdc5de5deb2cf (patch) | |
tree | f4a902db9aac80dee55614601c3d5c1c41381647 /stopspam.cpp | |
parent | 44b74b8166c88c5d1ee0bd999f2c5cc4115d8b3e (diff) | |
parent | 9d0f2d026293f0ed794cefaa796f756efd01e84a (diff) |
Merge remote branch 'origin/stopspam_mod_elzor' into stopspam_mod
Conflicts:
utilities.cpp
Diffstat (limited to 'stopspam.cpp')
-rw-r--r-- | stopspam.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/stopspam.cpp b/stopspam.cpp index 92d2658..e7ff9b9 100644 --- a/stopspam.cpp +++ b/stopspam.cpp @@ -83,8 +83,10 @@ MIRANDA_HOOK_EVENT(ME_DB_EVENT_ADDED, wParam, lParam) MIRANDA_HOOK_EVENT(ME_DB_EVENT_FILTER_ADD, w, l) { HANDLE hContact = (HANDLE)w; + if(!l) //fix potential DEP crash + return 0; DBEVENTINFO * dbei = (DBEVENTINFO*)l; - + // if event is in protocol that is not despammed if(!ProtoInList(dbei->szModule)) { @@ -192,7 +194,7 @@ MIRANDA_HOOK_EVENT(ME_DB_EVENT_FILTER_ADD, w, l) DBDeleteContactSetting(hContact, "CList", "NotOnList"); }; // auto auth. reqwest with send congratulation - if(gbAutoReqAuth) // ANSI may be not work + if(gbAutoReqAuth) CallContactService(hContact,PSS_AUTHREQUESTW,0, (LPARAM)variables_parse(gbCongratulation, hContact).c_str()); } } @@ -251,6 +253,7 @@ MIRANDA_HOOK_EVENT(ME_DB_EVENT_FILTER_ADD, w, l) CallService(MS_DB_EVENT_ADD, (WPARAM)hContact, (LPARAM)dbei); }; // reject processing of the event + LogSpamToFile(hContact, message); return 1; } |