From 711f58808447765b51367cb4a60581f8b8bb65ff Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 10 Nov 2017 16:22:38 -0500 Subject: 3.2.36.7 --- Emby.Server.Implementations/Library/LibraryManager.cs | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Emby.Server.Implementations/Library/LibraryManager.cs') diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs index bd8a09550..5eda986e1 100644 --- a/Emby.Server.Implementations/Library/LibraryManager.cs +++ b/Emby.Server.Implementations/Library/LibraryManager.cs @@ -709,6 +709,9 @@ 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; + // Add in the plug-in folders foreach (var child in PluginFolderCreators) { @@ -771,6 +774,9 @@ namespace Emby.Server.Implementations.Library tmpItem = (UserRootFolder)ResolvePath(_fileSystem.GetDirectoryInfo(userRootPath)); } + // In case program data folder was moved + tmpItem.Path = userRootPath; + _userRootFolder = tmpItem; } } -- cgit v1.2.3 From 351d29954a60084df3cca7dc6db2393298b366cd Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 12 Nov 2017 16:05:40 -0500 Subject: 3.2.36.8 --- Emby.Server.Implementations/Library/LibraryManager.cs | 12 ++++++++++-- MediaBrowser.Model/Entities/MediaStream.cs | 16 ++++++++-------- RSSDP/SsdpCommunicationsServer.cs | 6 ++++++ SharedVersion.cs | 2 +- 4 files changed, 25 insertions(+), 11 deletions(-) (limited to 'Emby.Server.Implementations/Library/LibraryManager.cs') 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 attributes = new List(); @@ -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 attributes = new List(); 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")] -- cgit v1.2.3