Tolerate error is user_defaults (#4060)

Former-commit-id: 178c3e140354c583bd226502dbc4afe12b2aa90f
This commit is contained in:
Tomasz Drwięga 2017-01-06 10:39:03 +01:00 committed by Gav Wood
parent f45fe8a1fd
commit 28648b26cb

View File

@ -128,7 +128,13 @@ impl Default for UserDefaults {
impl UserDefaults {
pub fn load<P>(path: P) -> Result<Self, String> where P: AsRef<Path> {
match File::open(path) {
Ok(file) => from_reader(file).map_err(|e| e.to_string()),
Ok(file) => match from_reader(file) {
Ok(defaults) => Ok(defaults),
Err(e) => {
warn!("Error loading user defaults file: {:?}", e);
Ok(UserDefaults::default())
},
},
_ => Ok(UserDefaults::default()),
}
}