diff --git a/source/glest_game/graphics/renderer.cpp b/source/glest_game/graphics/renderer.cpp index e44f9e602..a3426bf39 100644 --- a/source/glest_game/graphics/renderer.cpp +++ b/source/glest_game/graphics/renderer.cpp @@ -1657,7 +1657,7 @@ void Renderer::renderMessageBox(const GraphicMessageBox *messageBox) { glPopAttrib(); - glDisable(GL_BLEND); + //buttons renderButton(messageBox->getButton1()); if(messageBox->getButtonCount()==2){ diff --git a/source/glest_game/menu/menu_state_connected_game.cpp b/source/glest_game/menu/menu_state_connected_game.cpp index f2a08624d..204a77353 100644 --- a/source/glest_game/menu/menu_state_connected_game.cpp +++ b/source/glest_game/menu/menu_state_connected_game.cpp @@ -412,6 +412,7 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM ftpClientThread->start(); } + //showFTPMessageBox("test", lang.get("Question"), false); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__); } @@ -631,13 +632,6 @@ void MenuStateConnectedGame::render() { if(mainMessageBox.getEnabled()) { renderer.renderMessageBox(&mainMessageBox); } - if(ftpMessageBox.getEnabled()) { - renderer.renderMessageBox(&ftpMessageBox); - } - - //if(ftpMessageBox.getEnabled()) { - // renderer.renderMessageBox(&ftpMessageBox); - //} if (!initialSettingsReceivedFromServer) return; @@ -770,8 +764,6 @@ void MenuStateConnectedGame::render() { renderer.renderLabel(&labelNetworkPauseGameForLaggedClients); renderer.renderListBox(&listBoxNetworkPauseGameForLaggedClients); - if(program != NULL) program->renderProgramMsgBox(); - MutexSafeWrapper safeMutexFTPProgress((ftpClientThread != NULL ? ftpClientThread->getProgressMutex() : NULL),string(__FILE__) + "_" + intToStr(__LINE__)); if(fileFTPProgressList.size() > 0) { int yLocation = buttonDisconnect.getY(); @@ -793,6 +785,15 @@ void MenuStateConnectedGame::render() { } safeMutexFTPProgress.ReleaseLock(); + if(mainMessageBox.getEnabled()) { + renderer.renderMessageBox(&mainMessageBox); + } + if(ftpMessageBox.getEnabled()) { + renderer.renderMessageBox(&ftpMessageBox); + } + + if(program != NULL) program->renderProgramMsgBox(); + if(enableMapPreview && (mapPreview.hasFileLoaded() == true)) { int mouseX = mainMenu->getMouseX(); @@ -805,11 +806,6 @@ void MenuStateConnectedGame::render() { } renderer.renderChatManager(&chatManager); renderer.renderConsole(&console,showFullConsole,true); - - - if(mainMessageBox.getEnabled()) { - renderer.renderMessageBox(&mainMessageBox); - } } catch(const std::exception &ex) { char szBuf[1024]=""; diff --git a/source/shared_lib/sources/feathery_ftp/ftpTargetPosix.c b/source/shared_lib/sources/feathery_ftp/ftpTargetPosix.c index 5b27ee32a..86af1697d 100644 --- a/source/shared_lib/sources/feathery_ftp/ftpTargetPosix.c +++ b/source/shared_lib/sources/feathery_ftp/ftpTargetPosix.c @@ -421,7 +421,7 @@ int ftpSelect(int poll) if(poll) { struct timeval t = {0}; - t.tv_usec = 10000; + t.tv_usec = 100; return select(maxSockNr+1, &signaledSockets, NULL, NULL, &t); } else diff --git a/source/shared_lib/sources/feathery_ftp/ftpTargetWin32.c b/source/shared_lib/sources/feathery_ftp/ftpTargetWin32.c index a9626097c..3184e6174 100644 --- a/source/shared_lib/sources/feathery_ftp/ftpTargetWin32.c +++ b/source/shared_lib/sources/feathery_ftp/ftpTargetWin32.c @@ -454,7 +454,7 @@ int ftpSelect(int poll) if(poll) { struct timeval t = {0}; - t.tv_usec = 10000; + t.tv_usec = 100; return select(maxSockNr+1, &signaledSockets, NULL, NULL, &t); } else