From 2afe62952c52e9dc9cbd413db9a316ae4359c331 Mon Sep 17 00:00:00 2001 From: Loïc Blot Date: Thu, 28 Sep 2017 13:47:30 +0200 Subject: Server: affect bind_addr on constructor instead of start() (#6474) bind_addr is already ready when using constructor as we read is.IPv6 from it, instead pass the whole address --- src/main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 1a3c49658..792cd104d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -838,13 +838,13 @@ static bool run_dedicated_server(const GameParams &game_params, const Settings & try { // Create server Server server(game_params.world_path, game_params.game_spec, - false, bind_addr.isIPv6(), true, &iface); + false, bind_addr, true, &iface); g_term_console.setup(&iface, &kill, admin_nick); g_term_console.start(); - server.start(bind_addr); + server.start(); // Run server dedicated_server_loop(server, kill); } catch (const ModError &e) { @@ -872,8 +872,8 @@ static bool run_dedicated_server(const GameParams &game_params, const Settings & try { // Create server Server server(game_params.world_path, game_params.game_spec, false, - bind_addr.isIPv6(), true); - server.start(bind_addr); + bind_addr, true); + server.start(); // Run server bool &kill = *porting::signal_handler_killstatus(); -- cgit v1.2.3