mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-02-24 03:32:35 +01:00
Code Issues Projects Releases Wiki Activity

- another attempt to fix issue# 111

Browse Source
This commit is contained in:
SoftCoder 2016-06-02 12:07:01 -07:00
parent c3db863434
commit 05a5ff02d1
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,7 +127,7 @@ static FileCRCPreCacheThread *preCacheThread = NULL;
#ifdef WIN32 #ifdef WIN32
static string runtimeErrorMsg = ""; static string runtimeErrorMsg = "";
// keeps in scope for duration of the application // keeps in scope for duration of the application
auto_ptr<SocketManager> winSockManager(new SocketManager()); SocketManager *winSockManager = NULL;
#endif #endif
@ -5965,14 +5965,26 @@ __try {
#endif #endif
initSpecialStrings(); initSpecialStrings();
int result = 0;
try {
#ifdef WIN32
winSockManager = new SocketManager();
#endif
IRCThread::setGlobalCacheContainerName(GameConstants::ircClientCacheLookupKey); IRCThread::setGlobalCacheContainerName(GameConstants::ircClientCacheLookupKey);
int result = glestMain(argc, argv); result = glestMain(argc, argv);
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
cleanupProcessObjects(); cleanupProcessObjects();
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
}
catch(const exception &e) {
#ifdef WIN32
delete winSockManager;
winSockManager = NULL;
#endif
throw e;
}
if(sdl_quitCalled == false) { if(sdl_quitCalled == false) {
sdl_quitCalled = true; sdl_quitCalled = true;
SDL_Quit(); SDL_Quit();