- attempt to see if this fixes issue# 111
This commit is contained in:
parent
ad4314fb29
commit
c3db863434
|
@ -126,6 +126,9 @@ static Program *mainProgram = NULL;
|
||||||
static FileCRCPreCacheThread *preCacheThread = NULL;
|
static FileCRCPreCacheThread *preCacheThread = NULL;
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
static string runtimeErrorMsg = "";
|
static string runtimeErrorMsg = "";
|
||||||
|
// keeps in scope for duration of the application
|
||||||
|
auto_ptr<SocketManager> winSockManager(new SocketManager());
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_GOOGLE_BREAKPAD
|
#ifdef HAVE_GOOGLE_BREAKPAD
|
||||||
|
@ -4246,9 +4249,9 @@ int glestMain(int argc, char** argv) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef WIN32
|
//#ifdef WIN32
|
||||||
SocketManager winSockManager;
|
//SocketManager winSockManager;
|
||||||
#endif
|
//#endif
|
||||||
|
|
||||||
bool haveSpecialOutputCommandLineOption = false;
|
bool haveSpecialOutputCommandLineOption = false;
|
||||||
|
|
||||||
|
|
|
@ -129,9 +129,9 @@ public:
|
||||||
class Socket {
|
class Socket {
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
#ifdef WIN32
|
//#ifdef WIN32
|
||||||
static SocketManager wsaManager;
|
//static SocketManager wsaManager;
|
||||||
#endif
|
//#endif
|
||||||
PLATFORM_SOCKET sock;
|
PLATFORM_SOCKET sock;
|
||||||
time_t lastDebugEvent;
|
time_t lastDebugEvent;
|
||||||
static int broadcast_portno;
|
static int broadcast_portno;
|
||||||
|
|
|
@ -228,7 +228,7 @@ Mutex UPNP_Tools::mutexUPNP;
|
||||||
}
|
}
|
||||||
|
|
||||||
// keeps in scope for duration of the application
|
// keeps in scope for duration of the application
|
||||||
SocketManager Socket::wsaManager;
|
//SocketManager Socket::wsaManager;
|
||||||
|
|
||||||
SocketManager::SocketManager() {
|
SocketManager::SocketManager() {
|
||||||
WSADATA wsaData;
|
WSADATA wsaData;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user