Dont announce server in singleplayer

proller · proller · commit e65d8ad6553d · 2013-07-27T17:51:34.000+04:00
diff --git a/src/convert_json.cpp b/src/convert_json.cpp
@@ -55,10 +55,11 @@ Json::Value                 fetchJsonValue(const std::string url,
 		curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
 		curl_easy_setopt(curl, CURLOPT_WRITEDATA, &liststring);
 		curl_easy_setopt(curl, CURLOPT_TIMEOUT_MS, g_settings->getS32("curl_timeout"));
+		curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT_MS, g_settings->getS32("curl_timeout"));
+
 		if (chunk != 0)
 			curl_easy_setopt(curl, CURLOPT_HTTPHEADER, chunk);
 
-
 		res = curl_easy_perform(curl);
 		if (res != CURLE_OK)
 			errorstream<<"Jsonreader: "<< url <<" not found (" << curl_easy_strerror(res) << ")" <<std::endl;
diff --git a/src/server.cpp b/src/server.cpp
@@ -1242,7 +1242,7 @@ void Server::AsyncRunStep()
 	// send masterserver announce
 	{
 		float &counter = m_masterserver_timer;
-		if((!counter || counter >= 300.0) && g_settings->getBool("server_announce") == true)
+		if(!isSingleplayer() && (!counter || counter >= 300.0) && g_settings->getBool("server_announce") == true)
 		{
 			ServerList::sendAnnounce(!counter ? "start" : "update", m_clients_number, m_uptime.get(), m_gamespec.id, m_mods);
 			counter = 0.01;

Original file line number	Diff line number	Diff line change
`@@ -1242,7 +1242,7 @@ void Server::AsyncRunStep()`
`1242`	`1242`	`// send masterserver announce`
`1243`	`1243`	`{`
`1244`	`1244`	`float &counter = m_masterserver_timer;`
`1245`		`- if((!counter \|\| counter >= 300.0) && g_settings->getBool("server_announce") == true)`
	`1245`	`+ if(!isSingleplayer() && (!counter \|\| counter >= 300.0) && g_settings->getBool("server_announce") == true)`
`1246`	`1246`	`{`
`1247`	`1247`	`ServerList::sendAnnounce(!counter ? "start" : "update", m_clients_number, m_uptime.get(), m_gamespec.id, m_mods);`
`1248`	`1248`	`counter = 0.01;`