=== modified file 'dcpp/ConnectionManager.cpp'
--- dcpp/ConnectionManager.cpp	2013-09-29 14:47:02 +0000
+++ dcpp/ConnectionManager.cpp	2013-11-30 20:04:06 +0000
@@ -72,6 +72,11 @@
 		dcdebug("Skipping secure port: %d\n", CONNSETTING(TLS_PORT));
 		return;
 	}
+	if(CONNSETTING(TCP_PORT) == CONNSETTING(TLS_PORT))
+	{
+		LogManager::getInstance()->message(_("The encrypted transfer port cannot be the same as the transfer port, encrypted transfers will be disabled"));
+		return;
+	}
 	secureServer.reset(new Server(true, Util::toString(CONNSETTING(TLS_PORT)), CONNSETTING(BIND_ADDRESS)));
 }