X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Finit.c;h=1e8d7e825db985c41cbb9526562890a5ef137f0e;hp=5fc105b6b563859e470c965f7d585aec23421a05;hb=740b7b55a7f4982f08b09daee0152ec9df3240ae;hpb=06d8cf152effee74879d58cd6f05b6b6a7a982d1

diff --git a/src/init.c b/src/init.c
index 5fc105b6..1e8d7e82 100644
--- a/src/init.c
+++ b/src/init.c
@@ -5636,10 +5636,17 @@ static void InitArtworkDone(void)
 
 static void InitNetworkSettings(void)
 {
-  InitNetworkInfo(options.network || setup.network_mode,
+  boolean network_enabled = (options.network || setup.network_mode);
+  char *network_server = (options.server_host != NULL ? options.server_host :
+			  setup.network_server_hostname);
+
+  if (strEqual(network_server, STR_NETWORK_AUTO_DETECT))
+    network_server = NULL;
+
+  InitNetworkInfo(network_enabled,
 		  FALSE,
 		  options.serveronly,
-		  options.server_host,
+		  network_server,
 		  options.server_port);
 }