summaryrefslogtreecommitdiff
path: root/src/clientmedia.cpp
diff options
context:
space:
mode:
authorsapier <Sapier at GMX dot net>2014-04-26 01:15:46 +0200
committersapier <Sapier at GMX dot net>2014-04-29 20:45:16 +0200
commitc03d7dc8a7c35708a39f9c14e2df243e212b283b (patch)
treec99b8036e8ef45ab9228625570d860eefe5ac8d2 /src/clientmedia.cpp
parent088b18da3db8677a8af071e6e1534e54f73640b5 (diff)
downloadminetest-c03d7dc8a7c35708a39f9c14e2df243e212b283b.tar.gz
minetest-c03d7dc8a7c35708a39f9c14e2df243e212b283b.tar.bz2
minetest-c03d7dc8a7c35708a39f9c14e2df243e212b283b.zip
Add download rate to media progress bar (non http mode only!)
Minor coding style fixes
Diffstat (limited to 'src/clientmedia.cpp')
-rw-r--r--src/clientmedia.cpp18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/clientmedia.cpp b/src/clientmedia.cpp
index 35074a113..b3e7e8e06 100644
--- a/src/clientmedia.cpp
+++ b/src/clientmedia.cpp
@@ -110,14 +110,16 @@ void ClientMediaDownloader::addRemoteServer(std::string baseurl)
#ifdef USE_CURL
- infostream << "Client: Adding remote server \""
- << baseurl << "\" for media download" << std::endl;
-
- RemoteServerStatus *remote = new RemoteServerStatus;
- remote->baseurl = baseurl;
- remote->active_count = 0;
- remote->request_by_filename = false;
- m_remotes.push_back(remote);
+ if (g_settings->getBool("enable_remote_media_server")) {
+ infostream << "Client: Adding remote server \""
+ << baseurl << "\" for media download" << std::endl;
+
+ RemoteServerStatus *remote = new RemoteServerStatus;
+ remote->baseurl = baseurl;
+ remote->active_count = 0;
+ remote->request_by_filename = false;
+ m_remotes.push_back(remote);
+ }
#else