diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-07-02 12:38:54 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-07-02 12:38:54 +0000 |
| commit | 547af691ad60fb3935075f033343bb870dfba464 (patch) | |
| tree | 1c99dbcac4c7a126516e4b479020746af9696033 /protocols | |
| parent | 1e89dc73ca24c027ddb8fab6527a8d1cc180955e (diff) | |
fix for losing ICQ connection after searching by email
git-svn-id: http://svn.miranda-ng.org/main/trunk@9643 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/IcqOscarJ/src/icq_proto.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp index db08fe771c..e122c1f845 100644 --- a/protocols/IcqOscarJ/src/icq_proto.cpp +++ b/protocols/IcqOscarJ/src/icq_proto.cpp @@ -838,15 +838,11 @@ HANDLE __cdecl CIcqProto::SearchBasic(const PROTOCHAR *pszSearch) HANDLE __cdecl CIcqProto::SearchByEmail(const PROTOCHAR *email)
{
if (email && icqOnline() && strlennull(email) > 0) {
- DWORD dwSearchId, dwSecId;
char *szEmail = tchar_to_ansi(email);
// Success
- dwSearchId = SearchByMail(szEmail);
- if (m_bAimEnabled)
- dwSecId = icq_searchAimByEmail(szEmail, dwSearchId);
- else
- dwSecId = 0;
+ DWORD dwSearchId = SearchByMail(szEmail);
+ DWORD dwSecId = (dwSearchId == 0 && m_bAimEnabled) ? icq_searchAimByEmail(szEmail, dwSearchId) : 0;
SAFE_FREE(&szEmail);
|