Index: source/gui/scripting/ScriptFunctions.cpp
===================================================================
--- source/gui/scripting/ScriptFunctions.cpp    (revision 18117)
+++ source/gui/scripting/ScriptFunctions.cpp    (working copy)
@@ -347,48 +347,51 @@ void SetNetworkGameAttributes(ScriptInte
 void StartNetworkHost(ScriptInterface::CxPrivate* pCxPrivate, const std::wstring& playerName)
 {
    ENSURE(!g_NetClient);
    ENSURE(!g_NetServer);
    ENSURE(!g_Game);

    g_NetServer = new CNetServer();
    if (!g_NetServer->SetupConnection())
    {
        pCxPrivate->pScriptInterface->ReportError("Failed to start server");
        SAFE_DELETE(g_NetServer);
        return;
    }

    g_Game = new CGame();
    g_NetClient = new CNetClient(g_Game);
    g_NetClient->SetUserName(playerName);

    if (!g_NetClient->SetupConnection("127.0.0.1"))
    {
        pCxPrivate->pScriptInterface->ReportError("Failed to connect to server");
        SAFE_DELETE(g_NetClient);
        SAFE_DELETE(g_Game);
    }
+
+   g_NetClient->DisableTimeout();
+   g_NetServer->DisableTimeout(g_NetClient->GetGUID());
 }