Merge with develop

--HG--
branch : compatibility-develop
This commit is contained in:
Nimetu 2017-09-03 00:02:32 +03:00
commit 05e1346b5e

View file

@ -689,7 +689,7 @@ namespace NLGUI
char *ch; char *ch;
std::string contentType; std::string contentType;
res = curl_easy_getinfo(_CurlWWW->Request, CURLINFO_CONTENT_TYPE, &ch); res = curl_easy_getinfo(_CurlWWW->Request, CURLINFO_CONTENT_TYPE, &ch);
if (res == CURLE_OK) if (res == CURLE_OK && ch != NULL)
{ {
contentType = ch; contentType = ch;
} }