From 3ad5a53560a0a8b7a31d44c530da4b443e1651d8 Mon Sep 17 00:00:00 2001 From: titiger Date: Tue, 12 Nov 2019 00:25:57 +0100 Subject: [PATCH] more comfortable game setup delete --- source/glest_game/menu/menu_state_connected_game.cpp | 7 +++++++ source/glest_game/menu/menu_state_custom_game.cpp | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/source/glest_game/menu/menu_state_connected_game.cpp b/source/glest_game/menu/menu_state_connected_game.cpp index 8e1391f6..1ad04207 100644 --- a/source/glest_game/menu/menu_state_connected_game.cpp +++ b/source/glest_game/menu/menu_state_connected_game.cpp @@ -1971,9 +1971,16 @@ void MenuStateConnectedGame::mouseClickAdmin(int x, int y, MouseButton mouseButt else if ( buttonDeleteSetup.mouseClick(x, y)){ string setupName=comboBoxLoadSetup.getSelectedItem(); if( setupName!=""&& setupName!= lang.getString(LAST_SETUP_STRING)) { + int index=comboBoxLoadSetup.getSelectedItemIndex(); removeFile(savedSetupsDir+setupName+".mgg"); loadSavedSetupNames(); comboBoxLoadSetup.setItems(savedSetupFilenames); + if(comboBoxLoadSetup.getItemCount()>index){ + comboBoxLoadSetup.setSelectedItemIndex(index,false); + } + else{ + comboBoxLoadSetup.setSelectedItem( lang.getString(LAST_SETUP_STRING),false); + } console.addLine("X " +setupName+".mgg"); } } diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp index bb969f9e..2b714182 100644 --- a/source/glest_game/menu/menu_state_custom_game.cpp +++ b/source/glest_game/menu/menu_state_custom_game.cpp @@ -1286,9 +1286,16 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton) { else if ( buttonDeleteSetup.mouseClick(x, y)){ string setupName=comboBoxLoadSetup.getSelectedItem(); if( setupName!=""&& setupName!= lang.getString(LAST_SETUP_STRING)) { + int index=comboBoxLoadSetup.getSelectedItemIndex(); removeFile(savedSetupsDir+setupName+".mgg"); loadSavedSetupNames(); comboBoxLoadSetup.setItems(savedSetupFilenames); + if(comboBoxLoadSetup.getItemCount()>index){ + comboBoxLoadSetup.setSelectedItemIndex(index,false); + } + else{ + comboBoxLoadSetup.setSelectedItem( lang.getString(LAST_SETUP_STRING),false); + } console.addLine("X " +setupName+".mgg"); } }