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

- attempt to fix issue# 89

This commit is contained in:
SoftCoder 2015-12-12 22:01:48 -08:00
parent 4f5ecb13e5
commit b83414380c
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/glest_game

@ -1 +1 @@
Subproject commit f0cbcec28548c1eaf968b7598de0410e23dd0a5a
Subproject commit bf04854ade7cd0fc51483c857e590acfef4fbc26

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

@ -665,22 +665,23 @@ std::vector<string> IRCThread::GetIRCConnectedNickList(string target, bool waitF
bool IRCThread::isConnected(bool mutexLockRequired) {
bool ret = false;
if(this->getQuitStatus() == false) {
MutexSafeWrapper safeMutex(NULL,string(__FILE__) + "_" + intToStr(__LINE__));
if(mutexLockRequired == true) {
safeMutex.setMutex(&mutexIRCSession);
}
bool validSession = (ircSession != NULL);
safeMutex.ReleaseLock();
MutexSafeWrapper safeMutex(NULL,string(__FILE__) + "_" + intToStr(__LINE__));
if(mutexLockRequired == true) {
safeMutex.setMutex(&mutexIRCSession);
}
bool validSession = (ircSession != NULL);
safeMutex.ReleaseLock();
if(validSession == true) {
if(validSession == true) {
#if !defined(DISABLE_IRCCLIENT)
MutexSafeWrapper safeMutex1(NULL,string(__FILE__) + "_" + intToStr(__LINE__));
if(mutexLockRequired == true) {
safeMutex1.setMutex(&mutexIRCSession);
}
ret = (irc_is_connected(ircSession) != 0);
safeMutex1.ReleaseLock();
MutexSafeWrapper safeMutex1(NULL,string(__FILE__) + "_" + intToStr(__LINE__));
if(mutexLockRequired == true) {
safeMutex1.setMutex(&mutexIRCSession);
}
ret = (irc_is_connected(ircSession) != 0);
safeMutex1.ReleaseLock();
}
#endif
}