From c03d7dc8a7c35708a39f9c14e2df243e212b283b Mon Sep 17 00:00:00 2001
From: sapier <Sapier at GMX dot net>
Date: Sat, 26 Apr 2014 01:15:46 +0200
Subject: Add download rate to media progress bar (non http mode only!) Minor
 coding style fixes

---
 src/clientmedia.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'src/clientmedia.cpp')

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
 
-- 
cgit v1.2.3