diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-11-12 16:05:40 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-11-12 16:05:40 -0500 |
| commit | 351d29954a60084df3cca7dc6db2393298b366cd (patch) | |
| tree | ab0fa8772804b1f993d009fc3a48102897e6abc3 | |
| parent | 711f58808447765b51367cb4a60581f8b8bb65ff (diff) | |
3.2.36.8
| -rw-r--r-- | Emby.Server.Implementations/Library/LibraryManager.cs | 12 | ||||
| -rw-r--r-- | MediaBrowser.Model/Entities/MediaStream.cs | 16 | ||||
| -rw-r--r-- | RSSDP/SsdpCommunicationsServer.cs | 6 | ||||
| -rw-r--r-- | SharedVersion.cs | 2 |
4 files changed, 25 insertions, 11 deletions
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs index 5eda986e1..f71e2714a 100644 --- a/Emby.Server.Implementations/Library/LibraryManager.cs +++ b/Emby.Server.Implementations/Library/LibraryManager.cs @@ -710,7 +710,11 @@ namespace Emby.Server.Implementations.Library var rootFolder = GetItemById(GetNewItemId(rootFolderPath, typeof(AggregateFolder))) as AggregateFolder ?? (AggregateFolder)ResolvePath(_fileSystem.GetDirectoryInfo(rootFolderPath)); // In case program data folder was moved - rootFolder.Path = rootFolderPath; + if (!string.Equals(rootFolder.Path, rootFolderPath, StringComparison.Ordinal)) + { + _logger.Info("Resetting root folder path to {0}", rootFolderPath); + rootFolder.Path = rootFolderPath; + } // Add in the plug-in folders foreach (var child in PluginFolderCreators) @@ -775,7 +779,11 @@ namespace Emby.Server.Implementations.Library } // In case program data folder was moved - tmpItem.Path = userRootPath; + if (!string.Equals(tmpItem.Path, userRootPath, StringComparison.Ordinal)) + { + _logger.Info("Resetting user root folder path to {0}", userRootPath); + tmpItem.Path = userRootPath; + } _userRootFolder = tmpItem; } diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs index 4cdcde412..8a402e6f4 100644 --- a/MediaBrowser.Model/Entities/MediaStream.cs +++ b/MediaBrowser.Model/Entities/MediaStream.cs @@ -48,10 +48,10 @@ namespace MediaBrowser.Model.Entities { if (Type == MediaStreamType.Audio) { - if (!string.IsNullOrEmpty(Title)) - { - return AddLanguageIfNeeded(Title); - } + //if (!string.IsNullOrEmpty(Title)) + //{ + // return AddLanguageIfNeeded(Title); + //} List<string> attributes = new List<string>(); @@ -105,10 +105,10 @@ namespace MediaBrowser.Model.Entities if (Type == MediaStreamType.Subtitle) { - if (!string.IsNullOrEmpty(Title)) - { - return AddLanguageIfNeeded(Title); - } + //if (!string.IsNullOrEmpty(Title)) + //{ + // return AddLanguageIfNeeded(Title); + //} List<string> attributes = new List<string>(); diff --git a/RSSDP/SsdpCommunicationsServer.cs b/RSSDP/SsdpCommunicationsServer.cs index a4be24ebf..6b4f67b0b 100644 --- a/RSSDP/SsdpCommunicationsServer.cs +++ b/RSSDP/SsdpCommunicationsServer.cs @@ -366,6 +366,12 @@ namespace Rssdp.Infrastructure { foreach (var address in _networkManager.GetLocalIpAddresses()) { + if (address.AddressFamily == IpAddressFamily.InterNetworkV6) + { + // Not supported ? + continue; + } + try { sockets.Add(_SocketFactory.CreateSsdpUdpSocket(address, _LocalPort)); diff --git a/SharedVersion.cs b/SharedVersion.cs index 8ff6f604b..c89077695 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.36.7")] +[assembly: AssemblyVersion("3.2.36.8")] |