diff --git a/data/glest_game b/data/glest_game index f0cbcec28..bf04854ad 160000 --- a/data/glest_game +++ b/data/glest_game @@ -1 +1 @@ -Subproject commit f0cbcec28548c1eaf968b7598de0410e23dd0a5a +Subproject commit bf04854ade7cd0fc51483c857e590acfef4fbc26 diff --git a/source/shared_lib/sources/platform/posix/ircclient.cpp b/source/shared_lib/sources/platform/posix/ircclient.cpp index 5a57167a8..dbd1a983d 100644 --- a/source/shared_lib/sources/platform/posix/ircclient.cpp +++ b/source/shared_lib/sources/platform/posix/ircclient.cpp @@ -665,22 +665,23 @@ std::vector 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 }