- bufix for ftp tileset xfer, if no 7z file exists continue getting individual files
This commit is contained in:
parent
ab706e1762
commit
5f9e8d97d3
|
@ -349,8 +349,17 @@ void FTPClientThread::getTilesetFromServer(string tileSetName) {
|
|||
bool findArchive = executeShellCommand(this->fileArchiveExtractCommand);
|
||||
|
||||
FTP_Client_ResultType result = getTilesetFromServer(tileSetName, "", FTP_TILESETS_CUSTOM_USERNAME, FTP_COMMON_PASSWORD, findArchive);
|
||||
if(result == ftp_crt_FAIL && this->getQuitStatus() == false) {
|
||||
if(findArchive == true) {
|
||||
result = getTilesetFromServer(tileSetName, "", FTP_TILESETS_CUSTOM_USERNAME, FTP_COMMON_PASSWORD, false);
|
||||
}
|
||||
if(result == ftp_crt_FAIL && this->getQuitStatus() == false) {
|
||||
result = getTilesetFromServer(tileSetName, "", FTP_TILESETS_USERNAME, FTP_COMMON_PASSWORD, findArchive);
|
||||
|
||||
if(findArchive == true) {
|
||||
result = getTilesetFromServer(tileSetName, "", FTP_TILESETS_USERNAME, FTP_COMMON_PASSWORD, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
MutexSafeWrapper safeMutex(this->getProgressMutex(),string(__FILE__) + "_" + intToStr(__LINE__));
|
||||
|
|
Loading…
Reference in New Issue
Block a user