Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- try to fix the build

This commit is contained in:
SoftCoder 2016-06-02 13:41:59 -07:00
parent 798777f313
commit f1c372c7b5
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/glest_game/main/main.cpp
View File

@ -127,7 +127,7 @@ static FileCRCPreCacheThread *preCacheThread = NULL;
#ifdef WIN32
static string runtimeErrorMsg = "";
// keeps in scope for duration of the application
SocketManager *winSockManager = NULL;
//SocketManager *winSockManager = NULL;
#endif
@ -5946,6 +5946,12 @@ void EnableCrashingOnCrashes() {
#endif
int glestMainSEHWrapper(int argc, char** argv) {
#ifdef WIN32
//winSockManager = new SocketManager();
SocketManager winSockManager;
#endif
#ifdef WIN32_STACK_TRACE
//printf("Hooking up WIN32_STACK_TRACE...\n");
__try {
@ -5967,9 +5973,6 @@ __try {
initSpecialStrings();
int result = 0;
#ifdef WIN32
winSockManager = new SocketManager();
#endif
IRCThread::setGlobalCacheContainerName(GameConstants::ircClientCacheLookupKey);
result = glestMain(argc, argv);
@ -5979,8 +5982,8 @@ __try {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
#ifdef WIN32
delete winSockManager;
winSockManager = NULL;
//delete winSockManager;
//winSockManager = NULL;
#endif
if(sdl_quitCalled == false) {