summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikalaiR <nikolay.romanovich@narod.ru>2015-06-11 12:48:35 +0000
committerMikalaiR <nikolay.romanovich@narod.ru>2015-06-11 12:48:35 +0000
commit5778345f250585d701e34bbc1458f8c92a6166d2 (patch)
tree7591d3d4c8be0201bf5cdadd1a36215bda2d5ef9
parentea10fa390a8ca647ada27173ec5d375b8a597aa2 (diff)
SkypeWeb: crashfix.
git-svn-id: http://svn.miranda-ng.org/main/trunk@14115 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--protocols/SkypeWeb/src/skype_proto.cpp6
-rw-r--r--protocols/SkypeWeb/src/skype_search.cpp4
2 files changed, 4 insertions, 6 deletions
diff --git a/protocols/SkypeWeb/src/skype_proto.cpp b/protocols/SkypeWeb/src/skype_proto.cpp
index c62a8e6db1..c965d90a0e 100644
--- a/protocols/SkypeWeb/src/skype_proto.cpp
+++ b/protocols/SkypeWeb/src/skype_proto.cpp
@@ -98,12 +98,10 @@ MCONTACT CSkypeProto::AddToList(int, PROTOSEARCHRESULT *psr)
{
debugLogA("CSkypeProto::AddToList");
-
- ptrA skypeName(mir_t2a(ptrT(psr->id.t)));
- if (skypeName == NULL)
+ if (psr->id.a == NULL)
return NULL;
- MCONTACT hContact = AddContact(skypeName);
+ MCONTACT hContact = AddContact(psr->id.a);
return hContact;
}
diff --git a/protocols/SkypeWeb/src/skype_search.cpp b/protocols/SkypeWeb/src/skype_search.cpp
index 3284d4f533..0612f08631 100644
--- a/protocols/SkypeWeb/src/skype_search.cpp
+++ b/protocols/SkypeWeb/src/skype_search.cpp
@@ -66,8 +66,8 @@ void CSkypeProto::OnSearch(const NETLIBHTTPREQUEST *response)
PROTOSEARCHRESULT psr = { sizeof(psr) };
psr.flags = PSR_UTF8;
- psr.id.a = displayName.GetBuffer();
- psr.nick.a = nick.GetBuffer();
+ psr.id.a = nick.GetBuffer();
+ psr.nick.a = displayName.GetBuffer();
ProtoBroadcastAck(0, ACKTYPE_SEARCH, ACKRESULT_DATA, (HANDLE)1, (LPARAM)&psr);
}