lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3012 from MediaBrowser/dev

Browse Source 
3.2.36.8
This commit is contained in:
Luke 2017-11-12 16:06:19 -05:00 committed by GitHub
commit 7eab5889fc
4 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Emby.Server.Implementations/Library/LibraryManager.cs
View File

@ -710,7 +710,11 @@ namespace Emby.Server.Implementations.Library
var rootFolder = GetItemById(GetNewItemId(rootFolderPath, typeof(AggregateFolder))) as AggregateFolder ?? (AggregateFolder)ResolvePath(_fileSystem.GetDirectoryInfo(rootFolderPath)); var rootFolder = GetItemById(GetNewItemId(rootFolderPath, typeof(AggregateFolder))) as AggregateFolder ?? (AggregateFolder)ResolvePath(_fileSystem.GetDirectoryInfo(rootFolderPath));
// In case program data folder was moved // In case program data folder was moved
if (!string.Equals(rootFolder.Path, rootFolderPath, StringComparison.Ordinal))
{
_logger.Info("Resetting root folder path to {0}", rootFolderPath);
rootFolder.Path = rootFolderPath; rootFolder.Path = rootFolderPath;
}
// Add in the plug-in folders // Add in the plug-in folders
foreach (var child in PluginFolderCreators) foreach (var child in PluginFolderCreators)
@ -775,7 +779,11 @@ namespace Emby.Server.Implementations.Library
} }
// In case program data folder was moved // In case program data folder was moved
if (!string.Equals(tmpItem.Path, userRootPath, StringComparison.Ordinal))
{
_logger.Info("Resetting user root folder path to {0}", userRootPath);
tmpItem.Path = userRootPath; tmpItem.Path = userRootPath;
}
_userRootFolder = tmpItem; _userRootFolder = tmpItem;
} }

16
MediaBrowser.Model/Entities/MediaStream.cs
View File

@ -48,10 +48,10 @@ namespace MediaBrowser.Model.Entities
{ {
if (Type == MediaStreamType.Audio) if (Type == MediaStreamType.Audio)
{ {
if (!string.IsNullOrEmpty(Title)) //if (!string.IsNullOrEmpty(Title))
{ //{
return AddLanguageIfNeeded(Title); // return AddLanguageIfNeeded(Title);
} //}
List<string> attributes = new List<string>(); List<string> attributes = new List<string>();
@ -105,10 +105,10 @@ namespace MediaBrowser.Model.Entities
if (Type == MediaStreamType.Subtitle) if (Type == MediaStreamType.Subtitle)
{ {
if (!string.IsNullOrEmpty(Title)) //if (!string.IsNullOrEmpty(Title))
{ //{
return AddLanguageIfNeeded(Title); // return AddLanguageIfNeeded(Title);
} //}
List<string> attributes = new List<string>(); List<string> attributes = new List<string>();

6
RSSDP/SsdpCommunicationsServer.cs
View File

@ -366,6 +366,12 @@ namespace Rssdp.Infrastructure
{ {
foreach (var address in _networkManager.GetLocalIpAddresses()) foreach (var address in _networkManager.GetLocalIpAddresses())
{ {
if (address.AddressFamily == IpAddressFamily.InterNetworkV6)
{
// Not supported ?
continue;
}
try try
{ {
sockets.Add(_SocketFactory.CreateSsdpUdpSocket(address, _LocalPort)); sockets.Add(_SocketFactory.CreateSsdpUdpSocket(address, _LocalPort));

2
SharedVersion.cs
View File

@ -1,3 +1,3 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("3.2.36.7")] [assembly: AssemblyVersion("3.2.36.8")]