Tolerate error is user_defaults (#4060)

openethereum · Jan 6, 2017 · 178c3e1 · 178c3e1
1 parent a7ed6f6
commit 178c3e1
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/parity/user_defaults.rs b/parity/user_defaults.rs
@@ -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()),
 		}
 	}