Merge pull request #2997 from MediaBrowser/dev

Dev

Emby.Server.Implementations/Networking/NetworkManager.cs

@@ -106,7 +106,7 @@ namespace Emby.Server.Implementations.Networking
                 endpoint.StartsWith("127.", StringComparison.OrdinalIgnoreCase) ||
                 endpoint.StartsWith("192.168", StringComparison.OrdinalIgnoreCase) ||
                 endpoint.StartsWith("169.", StringComparison.OrdinalIgnoreCase) ||
-                //endpoint.StartsWith("10.", StringComparison.OrdinalIgnoreCase) ||
+                endpoint.StartsWith("10.", StringComparison.OrdinalIgnoreCase) ||
                 IsInPrivateAddressSpaceAndLocalSubnet(endpoint);
         }
 

MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs

@@ -92,7 +92,11 @@ namespace MediaBrowser.Providers.MediaInfo
 
         private string GetAudioImagePath(Audio item)
         {
-            var filename = item.Album ?? string.Empty;
+            string filename;
+
+            if (item.GetType() == typeof(Audio))
+            {
+                filename = item.Album ?? string.Empty;
                 filename += string.Join(",", item.Artists);
 
                 if (!string.IsNullOrWhiteSpace(item.Album))
@@ -109,6 +113,12 @@ namespace MediaBrowser.Providers.MediaInfo
                 }
 
                 filename = filename.GetMD5() + ".jpg";
+            }
+            else
+            {
+                // If it's an audio book or audio podcast, allow unique image per item
+                filename = item.Id.ToString("N") + ".jpg";
+            }
 
             var prefix = filename.Substring(0, 1);