From 2a27435f7e2bc3125152e528b41b0a4112e09092 Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Thu, 17 Feb 2022 03:00:35 -0800 Subject: [PATCH] Dictionary merge: Correctly drop empty data tags This allows for TagLib to handle artwork reading where the file built-in readers fail, such as the FFmpeg reader, which would require parsing the stream data for artwork packets, a really wacky convention to have. Signed-off-by: Christopher Snowhill --- Utils/NSDictionary+Merge.m | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Utils/NSDictionary+Merge.m b/Utils/NSDictionary+Merge.m index 6769e28a7..37312c733 100644 --- a/Utils/NSDictionary+Merge.m +++ b/Utils/NSDictionary+Merge.m @@ -20,6 +20,9 @@ } else if([objTarget isKindOfClass:[NSNumber class]]) { NSNumber *val = (NSNumber *)objTarget; isEmpty = [val isEqualTo:@(0)]; + } else if([objTarget isKindOfClass:[NSData class]]) { + NSData *val = (NSData *)objTarget; + isEmpty = [val length] == 0; } if(isEmpty) { [result setObject:obj forKey:key];