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

- lua bugfix for fog of war toggling

Browse Source 
- ftp client bugfix for reported segfault
This commit is contained in:
Mark Vejvoda
2011-01-10 00:05:31 +00:00
parent 38da21ae18
commit 7bc6b603b9
4 changed files with 57 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/shared_lib/sources/platform/posix/miniftpclient.cpp
View File

@@ -159,6 +159,9 @@ int file_progress(struct FtpFile *out,double download_total, double download_now
if(out != NULL &&
out->ftpServer != NULL &&
out->ftpServer->getCallBackObject() != NULL) {
if(out->ftpServer->getQuitStatus() == true) {
return -1;
}
FTPClientCallbackInterface::FtpProgressStats stats;
stats.download_total = download_total;
stats.download_now = download_now;
@@ -279,8 +282,8 @@ void FTPClientThread::getMapFromServer(string mapFileName) {
}
}
MutexSafeWrapper safeMutex(this->getProgressMutex());
if(this->pCBObject != NULL) {
MutexSafeWrapper safeMutex(this->getProgressMutex());
this->pCBObject->FTPClient_CallbackEvent(mapFileName,ftp_cct_Map,result,NULL);
}
}
@@ -305,8 +308,8 @@ void FTPClientThread::getTilesetFromServer(string tileSetName) {
result = getTilesetFromServer(tileSetName, "tilesets", "", "mg_ftp_server");
}
MutexSafeWrapper safeMutex(this->getProgressMutex());
if(this->pCBObject != NULL) {
MutexSafeWrapper safeMutex(this->getProgressMutex());
this->pCBObject->FTPClient_CallbackEvent(tileSetName,ftp_cct_Tileset,result,NULL);
}
}
@@ -445,6 +448,16 @@ FTP_Client_ResultType FTPClientThread::getTilesetFromServer(string tileSetName,
return result;
}
FTPClientCallbackInterface * FTPClientThread::getCallBackObject() {
MutexSafeWrapper safeMutex(this->getProgressMutex());
return pCBObject;
}
void FTPClientThread::setCallBackObject(FTPClientCallbackInterface *value) {
MutexSafeWrapper safeMutex(this->getProgressMutex());
pCBObject = value;
}
void FTPClientThread::execute() {
{
RunningStatusSafeWrapper runningStatus(this);