Control proxy overrides global proxy

Now the control proxy setting overrides $http_proxy environment variable
and proxy config setting.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/main.c b/src/main.c
index 7a260fc..86bdaf1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -125,15 +125,15 @@ int main (int argc, char **argv) {
 
 	/* set up proxy (control proxy for non-us citizen or global proxy for poor
 	 * firewalled fellows) */
-	if (settings.proxy != NULL && strlen (settings.proxy) > 0) {
+	if (settings.controlProxy != NULL) {
+		/* control proxy overrides global proxy */
 		char tmpPath[2];
-		WaitressSplitUrl (settings.proxy, waith.proxyHost,
+		WaitressSplitUrl (settings.controlProxy, waith.proxyHost,
 				sizeof (waith.proxyHost), waith.proxyPort,
 				sizeof (waith.proxyPort), tmpPath, sizeof (tmpPath));
-	} else if (settings.controlProxy != NULL) {
-		/* global proxy overrides control proxy */
+	} else if (settings.proxy != NULL && strlen (settings.proxy) > 0) {
 		char tmpPath[2];
-		WaitressSplitUrl (settings.controlProxy, waith.proxyHost,
+		WaitressSplitUrl (settings.proxy, waith.proxyHost,
 				sizeof (waith.proxyHost), waith.proxyPort,
 				sizeof (waith.proxyPort), tmpPath, sizeof (tmpPath));
 	}