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

- bugfix clinet connected menu and FTP transfer thread mutex

Browse Source
This commit is contained in:
Mark Vejvoda
2011-01-04 22:13:49 +00:00
parent 02e591c41d
commit a029b92b2c
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/glest_game/menu/menu_state_connected_game.cpp
View File

@@ -453,7 +453,7 @@ void MenuStateConnectedGame::mouseClick(int x, int y, MouseButton mouseButton){
if(ftpClientThread != NULL) { if(ftpClientThread != NULL) {
ftpClientThread->addMapToRequests(getMissingMapFromFTPServer); ftpClientThread->addMapToRequests(getMissingMapFromFTPServer);
MutexSafeWrapper safeMutexFTPProgress(ftpClientThread->getProgressMutex()); MutexSafeWrapper safeMutexFTPProgress((ftpClientThread != NULL ? ftpClientThread->getProgressMutex() : NULL),string(__FILE__) + "_" + intToStr(__LINE__)));
fileFTPProgressList[getMissingMapFromFTPServer] = pair<int,string>(0,""); fileFTPProgressList[getMissingMapFromFTPServer] = pair<int,string>(0,"");
} }
} }
@@ -466,7 +466,7 @@ void MenuStateConnectedGame::mouseClick(int x, int y, MouseButton mouseButton){
if(ftpClientThread != NULL) { if(ftpClientThread != NULL) {
ftpClientThread->addTilesetToRequests(getMissingTilesetFromFTPServer); ftpClientThread->addTilesetToRequests(getMissingTilesetFromFTPServer);
MutexSafeWrapper safeMutexFTPProgress(ftpClientThread->getProgressMutex()); MutexSafeWrapper safeMutexFTPProgress((ftpClientThread != NULL ? ftpClientThread->getProgressMutex() : NULL),string(__FILE__) + "_" + intToStr(__LINE__)));
fileFTPProgressList[getMissingTilesetFromFTPServer] = pair<int,string>(0,""); fileFTPProgressList[getMissingTilesetFromFTPServer] = pair<int,string>(0,"");
} }
} }
@@ -752,18 +752,21 @@ void MenuStateConnectedGame::render() {
if(program != NULL) program->renderProgramMsgBox(); if(program != NULL) program->renderProgramMsgBox();
MutexSafeWrapper safeMutexFTPProgress(ftpClientThread->getProgressMutex()); MutexSafeWrapper safeMutexFTPProgress((ftpClientThread != NULL ? ftpClientThread->getProgressMutex() : NULL),string(__FILE__) + "_" + intToStr(__LINE__)));
if(fileFTPProgressList.size() > 0) { if(fileFTPProgressList.size() > 0) {
int yLocation = buttonDisconnect.getY(); int yLocation = buttonDisconnect.getY();
for(std::map<string,pair<int,string> >::iterator iterMap = fileFTPProgressList.begin(); for(std::map<string,pair<int,string> >::iterator iterMap = fileFTPProgressList.begin();
iterMap != fileFTPProgressList.end(); ++iterMap) { iterMap != fileFTPProgressList.end(); ++iterMap) {
string progressLabelPrefix = "Downloading " + iterMap->first + " [" + iterMap->second.second + "] ";
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("\nRendering file progress with the following prefix [%s]\n",progressLabelPrefix.c_str());
renderer.renderProgressBar( renderer.renderProgressBar(
iterMap->second.first, iterMap->second.first,
10, 10,
yLocation, yLocation,
CoreData::getInstance().getDisplayFontSmall(), CoreData::getInstance().getDisplayFontSmall(),
350,"Downloading " + iterMap->first + " [" + iterMap->second.second + "] "); 350,progressLabelPrefix);
yLocation -= 100; yLocation -= 100;
} }
@@ -1714,14 +1717,14 @@ void MenuStateConnectedGame::FTPClient_CallbackEvent(string itemName, FTP_Client
if(stats->download_total > 0) { if(stats->download_total > 0) {
fileProgress = ((stats->download_now / stats->download_total) * 100.0); fileProgress = ((stats->download_now / stats->download_total) * 100.0);
} }
printf("Got FTP Callback for [%s] current file [%s] fileProgress = %d [now = %f, total = %f]\n",itemName.c_str(),stats->currentFilename.c_str(), fileProgress,stats->download_now,stats->download_total); if(SystemFlags::VERBOSE_MODE_ENABLED) printf("Got FTP Callback for [%s] current file [%s] fileProgress = %d [now = %f, total = %f]\n",itemName.c_str(),stats->currentFilename.c_str(), fileProgress,stats->download_now,stats->download_total);
fileFTPProgressList[itemName] = pair<int,string>(fileProgress,stats->currentFilename); fileFTPProgressList[itemName] = pair<int,string>(fileProgress,stats->currentFilename);
} }
} }
else if(type == ftp_cct_Map) { else if(type == ftp_cct_Map) {
getMissingMapFromFTPServerInProgress = false; getMissingMapFromFTPServerInProgress = false;
printf("Got FTP Callback for [%s] result = %d\n",itemName.c_str(),result); if(SystemFlags::VERBOSE_MODE_ENABLED) printf("Got FTP Callback for [%s] result = %d\n",itemName.c_str(),result);
MutexSafeWrapper safeMutexFTPProgress(ftpClientThread->getProgressMutex()); MutexSafeWrapper safeMutexFTPProgress(ftpClientThread->getProgressMutex());
fileFTPProgressList.erase(itemName); fileFTPProgressList.erase(itemName);
@@ -1746,7 +1749,7 @@ void MenuStateConnectedGame::FTPClient_CallbackEvent(string itemName, FTP_Client
} }
else if(type == ftp_cct_Tileset) { else if(type == ftp_cct_Tileset) {
getMissingTilesetFromFTPServerInProgress = false; getMissingTilesetFromFTPServerInProgress = false;
printf("Got FTP Callback for [%s] result = %d\n",itemName.c_str(),result); if(SystemFlags::VERBOSE_MODE_ENABLED) printf("Got FTP Callback for [%s] result = %d\n",itemName.c_str(),result);
MutexSafeWrapper safeMutexFTPProgress(ftpClientThread->getProgressMutex()); MutexSafeWrapper safeMutexFTPProgress(ftpClientThread->getProgressMutex());
fileFTPProgressList.erase(itemName); fileFTPProgressList.erase(itemName);