aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWeblate <42@minetest.ru>2013-03-01 17:13:22 +0100
committerWeblate <42@minetest.ru>2013-03-01 17:13:22 +0100
commit75a8312f4e43ecfa71ef96fd3c1784cedde1c98d (patch)
tree3efea23cc1d24beaccaf15d24be04a2a0f7f364c /src
parent48b999a8dd73ad5dfaf5343d72168927f4463e1c (diff)
parent3823878305568f099b7ebeac3fd5a226dd68c9b9 (diff)
downloadminetest-75a8312f4e43ecfa71ef96fd3c1784cedde1c98d.tar.gz
minetest-75a8312f4e43ecfa71ef96fd3c1784cedde1c98d.tar.bz2
minetest-75a8312f4e43ecfa71ef96fd3c1784cedde1c98d.zip
Merge remote branch 'origin/master'
Diffstat (limited to 'src')
-rw-r--r--src/serverlist.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/serverlist.cpp b/src/serverlist.cpp
index b5e6aad4e..d37b5d637 100644
--- a/src/serverlist.cpp
+++ b/src/serverlist.cpp
@@ -84,6 +84,7 @@ std::vector<ServerListSpec> getOnline()
{
CURLcode res;
+ curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
curl_easy_setopt(curl, CURLOPT_URL, (g_settings->get("serverlist_url")+"/list").c_str());
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, ServerList::WriteCallback);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &liststring);