Merge pull request #3012 from MediaBrowser/dev

3.2.36.8

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;
                     }

MediaBrowser.Model/Entities/MediaStream.cs

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

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));

SharedVersion.cs

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