From 45d92611636983f3f61cb8bec4acd3c09223c3e4 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Wed, 2 Nov 2011 19:11:58 +0000 Subject: [PATCH] fixed autoconfig and default keys (thanksfor the patches david) --- source/glest_game/menu/menu_state_keysetup.cpp | 2 +- source/glest_game/menu/menu_state_options.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/glest_game/menu/menu_state_keysetup.cpp b/source/glest_game/menu/menu_state_keysetup.cpp index d74f703e..31899328 100644 --- a/source/glest_game/menu/menu_state_keysetup.cpp +++ b/source/glest_game/menu/menu_state_keysetup.cpp @@ -262,7 +262,7 @@ void MenuStateKeysetup::mouseClick(int x, int y, MouseButton mouseButton){ delete *this->parentUI; } - mainMenu->setState(new MenuStateOptions(program, mainMenu)); + mainMenu->setState(new MenuStateKeysetup(program, mainMenu)); if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); } else if(buttonOk.mouseClick(x, y)){ diff --git a/source/glest_game/menu/menu_state_options.cpp b/source/glest_game/menu/menu_state_options.cpp index 2fb54a51..51582907 100644 --- a/source/glest_game/menu/menu_state_options.cpp +++ b/source/glest_game/menu/menu_state_options.cpp @@ -728,7 +728,7 @@ void MenuStateOptions::mouseClick(int x, int y, MouseButton mouseButton){ else if(buttonAutoConfig.mouseClick(x, y)){ soundRenderer.playFx(coreData.getClickSoundA()); Renderer::getInstance().autoConfig(); - saveConfig(); + //saveConfig(); mainMenu->setState(new MenuStateOptions(program, mainMenu)); return; }