From: Niki Roo Date: Fri, 1 May 2020 09:16:56 +0000 (+0200) Subject: Merge branch 'subtree' X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=commitdiff_plain;h=9991e4e10cd1cb607210ecfda9ed48232574be21;hp=-c Merge branch 'subtree' --- 9991e4e10cd1cb607210ecfda9ed48232574be21 diff --combined src/be/nikiroo/fanfix/library/RemoteLibraryServer.java index 4ee3f74,ef17e28..ef17e28 --- a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java +++ b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java @@@ -512,12 -512,14 +512,14 @@@ public class RemoteLibraryServer extend } private MetaData removeCover(MetaData meta) { - MetaData light; - if (meta.getCover() == null) { - light = meta; - } else { - light = meta.clone(); - light.setCover(null); + MetaData light = null; + if (meta != null) { + if (meta.getCover() == null) { + light = meta; + } else { + light = meta.clone(); + light.setCover(null); + } } return light;