summary refs log tree commit diff stats
path: root/src/common
diff options
context:
space:
mode:
authorTingPing <tingping@tingping.se>2014-12-15 14:51:07 -0500
committerTingPing <tingping@tingping.se>2014-12-15 14:51:07 -0500
commit46061f4f3cad58acefeab840f9627ba9293568bb (patch)
tree94254a6f304910f29b64e4079a9a0a65c97fff5e /src/common
parentec7a0d6e13f0fa66299cab7fdad8e639e01ee9dd (diff)
Remove some unnecessary if statements
Diffstat (limited to 'src/common')
-rw-r--r--src/common/server.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/common/server.c b/src/common/server.c
index f42ec20c..3e9e256f 100644
--- a/src/common/server.c
+++ b/src/common/server.c
@@ -1517,10 +1517,8 @@ server_child (server * serv)
 
 	if (!serv->dont_use_proxy) /* blocked in serverlist? */
 	{
-		if (FALSE)
-			;
 #ifdef USE_LIBPROXY
-		else if (prefs.hex_net_proxy_type == 5)
+		if (prefs.hex_net_proxy_type == 5)
 		{
 			char **proxy_list;
 			char *url, *proxy;
@@ -1554,7 +1552,7 @@ server_child (server * serv)
 			g_free (url);
 		}
 #endif
-		else if (prefs.hex_net_proxy_host[0] &&
+		if (prefs.hex_net_proxy_host[0] &&
 			   prefs.hex_net_proxy_type > 0 &&
 			   prefs.hex_net_proxy_use != 2) /* proxy is NOT dcc-only */
 		{