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

Fixes terminating due to corrupt preferences.

Browse source 
(Fixes bug #19970, partly fixes FR #20366.)
This commit is contained in:
Mark de Wever 2013-02-10 09:46:45 +00:00
parent 8bb37576c4
commit c36e8d2914
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -93,6 +93,7 @@ Version 1.11.1+svn:
* Make drakes fly on volcano tiles (bug #20485).
* Added a FOREACH macro to emulate C++11 for(... : ...) style loops.
* Fixed bug #20290: No longer terminate due to a corrupt savegame.
* Fixed bug #19970: No longer terminate due to corrupt preferences.
Version 1.11.1:
* AI:

25
src/preferences.cpp
View file

@ -35,6 +35,9 @@
#include <sys/stat.h> // for setting the permissions of the preferences file
#include <boost/concept_check.hpp>
static lg::log_domain log_config("config");
#define ERR_CFG LOG_STREAM(err , log_config)
static lg::log_domain log_filesystem("filesystem");
#define ERR_FS LOG_STREAM(err, log_filesystem)
@ -55,19 +58,25 @@ namespace preferences {
base_manager::base_manager()
{
try{
#ifdef DEFAULT_PREFS_PATH
scoped_istream stream = istream_file(get_default_prefs_file());
read(prefs, *stream);
scoped_istream stream = istream_file(get_default_prefs_file());
read(prefs, *stream);
config user_prefs;
stream = istream_file(get_prefs_file());
read(user_prefs, *stream);
config user_prefs;
stream = istream_file(get_prefs_file());
read(user_prefs, *stream);
prefs.merge_with(user_prefs);
prefs.merge_with(user_prefs);
#else
scoped_istream stream = istream_file(get_prefs_file());
read(prefs, *stream);
scoped_istream stream = istream_file(get_prefs_file());
read(prefs, *stream);
#endif
} catch(const config::error& e) {
ERR_CFG << "Error loading preference, message: "
<< e.what()
<< '\n';
}
}
base_manager::~base_manager()