Merge branch 'develop' into KoffeinFlummi-keybindings

This commit is contained in:
Henrik Friedrichsen
2019-03-17 16:12:49 +01:00

View File

@@ -72,16 +72,19 @@ impl Playlists {
cache_path.to_str().unwrap()
);
let parsed: Result<PlaylistStore, _> = serde_json::from_str(&contents);
if let Ok(cache) = parsed {
debug!("playlist cache loaded ({} lists)", cache.playlists.len());
let mut store = self.store.write().expect("can't writelock playlist store");
store.clear();
store.extend(cache.playlists);
match parsed {
Ok(cache) => {
debug!("playlist cache loaded ({} lists)", cache.playlists.len());
let mut store = self.store.write().expect("can't writelock playlist store");
store.clear();
store.extend(cache.playlists);
// force refresh of UI (if visible)
self.ev.send(Event::ScreenChange("playlists".to_owned()));
} else {
error!("playlist cache corrupted?");
// force refresh of UI (if visible)
self.ev.send(Event::ScreenChange("playlists".to_owned()));
},
Err(e) => {
error!("can't parse playlist cache: {}", e);
}
}
}
}