0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add try & catch for load_game_config_for_game().

Browse source 
This guarantees that game config willd be restore after unsuccessful
loading.
This commit is contained in:
Andrius Silinskas 2013-06-18 18:24:00 +01:00
parent 3de33c39f5
commit 7df2142fd8
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/game_config_manager.cpp
View file

@ -105,7 +105,6 @@ void game_config_manager::load_game_config(FORCE_RELOAD_CONFIG force_reload)
return;
}
old_defines_map_ = cache_.get_preproc_map();
loadscreen::global_loadscreen_manager loadscreen_manager(disp_.video());
cursor::setter cur(cursor::WAIT);
@ -156,6 +155,8 @@ void game_config_manager::load_game_config(FORCE_RELOAD_CONFIG force_reload)
throw;
}
old_defines_map_ = cache_.get_preproc_map();
manager_state.set_status_success();
// Set new binary paths.
@ -322,7 +323,23 @@ void game_config_manager::load_game_config_for_game(
extra_defines.push_back(new_define);
}
load_game_config(NO_FORCE_RELOAD);
try{
load_game_config(NO_FORCE_RELOAD);
}
catch(game::error& e) {
cache_.clear_defines();
std::deque<define> previous_defines;
BOOST_FOREACH(const preproc_map::value_type& preproc, old_defines_map_) {
define new_define
(new game_config::scoped_preproc_define(preproc.first));
previous_defines.push_back(new_define);
}
load_game_config(NO_FORCE_RELOAD);
throw;
}
}
game_config_manager_state::game_config_manager_state(config* game_config,