shithub: choc

Info  •  Files  •  Log  •  Branches

Fix problem with -autojoin apparently caused by merge error.

Subversion-branch: /branches/raven-branch
Subversion-revision: 2218

--- a/src/doom/d_net.c

+++ b/src/doom/d_net.c

@@ -479,6 +479,7 @@

         NET_SV_Init();

         NET_SV_AddModule(&net_loop_server_module);

         NET_SV_AddModule(&net_sdl_module);

+        NET_SV_RegisterWithMaster();

         net_loop_client_module.InitClient();

         addr = net_loop_client_module.ResolveAddress(NULL);

@@ -497,7 +498,6 @@

         if (i > 0)

         {

             addr = NET_FindLANServer();

-            NET_SV_RegisterWithMaster();

             if (addr == NULL)

             {