From bd24409e20fbe671763f8bdfda83b6262875eb36 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Mon, 15 Oct 2012 22:51:40 +0000 Subject: [PATCH] - bugfix to cancel properly and detect if we are in mod center mode or not --- source/glest_game/menu/menu_state_connected_game.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/glest_game/menu/menu_state_connected_game.cpp b/source/glest_game/menu/menu_state_connected_game.cpp index 647b2fa6..4b88b922 100644 --- a/source/glest_game/menu/menu_state_connected_game.cpp +++ b/source/glest_game/menu/menu_state_connected_game.cpp @@ -1094,7 +1094,7 @@ void MenuStateConnectedGame::mouseClick(int x, int y, MouseButton mouseButton){ soundRenderer.playFx(coreData.getClickSoundA()); ftpMessageBox.setEnabled(false); - if(button == 0 || button == 1) { + if(button == 0 || (button == 1 && ftpMessageBox.getButtonCount() == 3)) { if(ftpMissingDataType == ftpmsg_MissingMap) { getMissingMapFromFTPServerInProgress = true; @@ -1113,7 +1113,7 @@ void MenuStateConnectedGame::mouseClick(int x, int y, MouseButton mouseButton){ } if(ftpClientThread != NULL) { - if(button == 0) { + if(button == 0 && ftpMessageBox.getButtonCount() == 3) { string mapName = getMissingMapFromFTPServer; string mapURL = mapCacheList[mapName].url; @@ -1148,7 +1148,7 @@ void MenuStateConnectedGame::mouseClick(int x, int y, MouseButton mouseButton){ } if(ftpClientThread != NULL) { - if(button == 0) { + if(button == 0 && ftpMessageBox.getButtonCount() == 3) { string tilesetName = getMissingTilesetFromFTPServer; string tilesetURL = tilesetCacheList[tilesetName].url; @@ -1183,7 +1183,7 @@ void MenuStateConnectedGame::mouseClick(int x, int y, MouseButton mouseButton){ } if(ftpClientThread != NULL) { - if(button == 0) { + if(button == 0 && ftpMessageBox.getButtonCount() == 3) { string techName = getMissingTechtreeFromFTPServer; string techURL = techCacheList[techName].url;