mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-11 19:04:00 +02:00
Code Issues Projects Releases Wiki Activity

- bugfix for ircclient segfault using global cache

Browse Source
This commit is contained in:
Mark Vejvoda
2013-01-08 07:55:48 +00:00
parent 6872a873b2
commit 67be884d25
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4990,6 +4990,7 @@ __try {
#endif #endif
initSpecialStrings(); initSpecialStrings();
IRCThread::setGlobalCacheContainerName(GameConstants::ircClientCacheLookupKey);
int result = glestMain(argc, argv); int 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__);

3
source/shared_lib/include/platform/posix/ircclient.h
View File

@@ -55,6 +55,7 @@ class IRCThread : public BaseThread
public: public:
static bool debugEnabled; static bool debugEnabled;
protected: protected:
static const char *globalCacheContainerName;
std::vector<string> argv; std::vector<string> argv;
irc_session_t *ircSession; irc_session_t *ircSession;
@@ -86,6 +87,8 @@ public:
virtual void signalQuit(); virtual void signalQuit();
virtual bool shutdownAndWait(); virtual bool shutdownAndWait();
static void setGlobalCacheContainerName(const char *name) { globalCacheContainerName = name; }
void setPlayerName(string value) { playerName = value; } void setPlayerName(string value) { playerName = value; }
string getPlayerName() const { return playerName; } string getPlayerName() const { return playerName; }

7
source/shared_lib/sources/platform/posix/ircclient.cpp
View File

@@ -13,6 +13,7 @@
#include "ircclient.h" #include "ircclient.h"
#include "util.h" #include "util.h"
#include "platform_common.h" #include "platform_common.h"
#include "cache_manager.h"
#if !defined(DISABLE_IRCCLIENT) #if !defined(DISABLE_IRCCLIENT)
@@ -35,6 +36,7 @@ using namespace Shared::PlatformCommon;
namespace Shared { namespace PlatformCommon { namespace Shared { namespace PlatformCommon {
const char *IRCThread::globalCacheContainerName = NULL;
const int IRC_SERVER_PORT = 6667; const int IRC_SERVER_PORT = 6667;
//bool IRCThread::debugEnabled = true; //bool IRCThread::debugEnabled = true;
bool IRCThread::debugEnabled = false; bool IRCThread::debugEnabled = false;
@@ -697,6 +699,11 @@ void IRCThread::execute() {
IRCThread::~IRCThread() { IRCThread::~IRCThread() {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In ~IRCThread() ...\n"); if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In ~IRCThread() ...\n");
if(IRCThread::globalCacheContainerName != NULL) {
IRCThread * &ircClient = CacheManager::getCachedItem< IRCThread * >(IRCThread::globalCacheContainerName);
ircClient = NULL;
}
} }
void normalizeNick(char *nick) { void normalizeNick(char *nick) {