From 59d5d0d646f3d4ca1eb2370154db4b4371185e2f Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 11 Dec 2010 01:01:45 +0000
Subject: Fix problem with -autojoin apparently caused by merge error.

Subversion-branch: /branches/raven-branch
Subversion-revision: 2218
---
 src/doom/d_net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/doom/d_net.c b/src/doom/d_net.c
index 93a48b41..73e7368f 100644
--- a/src/doom/d_net.c
+++ b/src/doom/d_net.c
@@ -479,6 +479,7 @@ boolean D_InitNetGame(net_connect_data_t *connect_data,
         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 @@ boolean D_InitNetGame(net_connect_data_t *connect_data,
         if (i > 0)
         {
             addr = NET_FindLANServer();
-            NET_SV_RegisterWithMaster();
 
             if (addr == NULL)
             {
-- 
cgit v1.2.3