From 33060f2573e523ed0895c17eb649acb9ee0f9f2f Mon Sep 17 00:00:00 2001 From: MikalaiR Date: Thu, 11 Feb 2016 11:14:54 +0000 Subject: SkypeWeb: attempt to fix random crash git-svn-id: http://svn.miranda-ng.org/main/trunk@16271 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/SkypeWeb/src/skype_files.cpp | 2 +- protocols/SkypeWeb/src/skype_polling.cpp | 1 + protocols/SkypeWeb/src/skype_trouter.cpp | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'protocols/SkypeWeb') diff --git a/protocols/SkypeWeb/src/skype_files.cpp b/protocols/SkypeWeb/src/skype_files.cpp index 90654bb155..e3a68d8bf6 100644 --- a/protocols/SkypeWeb/src/skype_files.cpp +++ b/protocols/SkypeWeb/src/skype_files.cpp @@ -91,7 +91,7 @@ void CSkypeProto::OnASMObjectUploaded(const NETLIBHTTPREQUEST *response, void *a xmlAddAttr(xml, L"uri", CMStringW(FORMAT, L"https://api.asm.skype.com/v1/objects/%s", _A2T(fup->uid))); xmlAddAttr(xml, L"url_thumbnail", CMStringW(FORMAT, L"https://api.asm.skype.com/v1/objects/%s/views/thumbnail", _A2T(fup->uid))); - SendRequest(new SendMessageRequest(ptrA(getStringA(fup->hContact, SKYPE_SETTINGS_ID)), time(NULL), T2Utf(xmlToString(xml, nullptr)), li, "RichText/Media_GenericFile")); + SendRequest(new SendMessageRequest(ptrA(getStringA(fup->hContact, SKYPE_SETTINGS_ID)), time(NULL), T2Utf(ptrT(xmlToString(xml, nullptr))), li, "RichText/Media_GenericFile")); xmlDestroyNode(xml); ProtoBroadcastAck(fup->hContact, ACKTYPE_FILE, ACKRESULT_SUCCESS, (HANDLE)fup); delete fup; diff --git a/protocols/SkypeWeb/src/skype_polling.cpp b/protocols/SkypeWeb/src/skype_polling.cpp index 196d7ad731..6fe8f198b3 100644 --- a/protocols/SkypeWeb/src/skype_polling.cpp +++ b/protocols/SkypeWeb/src/skype_polling.cpp @@ -37,6 +37,7 @@ void CSkypeProto::PollingThread(void*) if (response == NULL) { nErrors++; + m_pollingConnection = nullptr; continue; } diff --git a/protocols/SkypeWeb/src/skype_trouter.cpp b/protocols/SkypeWeb/src/skype_trouter.cpp index a539328feb..a1b6768ce9 100644 --- a/protocols/SkypeWeb/src/skype_trouter.cpp +++ b/protocols/SkypeWeb/src/skype_trouter.cpp @@ -147,6 +147,7 @@ void CSkypeProto::TRouterThread(void*) delete request; if (response == NULL) { + m_TrouterConnection = nullptr; errors++; continue; } -- cgit v1.2.3