added text input setup option to configure network server hostname

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index 5fc105b6b563859e470c965f7d585aec23421a05..1e8d7e825db985c41cbb9526562890a5ef137f0e 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -5636,10 +5636,17 @@ static void InitArtworkDone(void)
 
 static void InitNetworkSettings(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,
                  FALSE,
                  options.serveronly,

-                 options.server_host,
+                 network_server,

                  options.server_port);
 }
 
                  options.server_port);
 }