Merge pull request #2173 from MediaBrowser/dev

Dev

MediaBrowser.Dlna/Main/DlnaEntryPoint.cs

@@ -110,18 +110,6 @@ namespace MediaBrowser.Dlna.Main
         {
             var options = _config.GetDlnaConfiguration();
 
-            if (!options.EnableServer && !options.EnablePlayTo && !_config.Configuration.EnableUPnP)
-            {
-                if (_ssdpHandlerStarted)
-                {
-                    // Sat/ip live tv depends on device discovery, as well as hd homerun detection
-                    // In order to allow this to be disabled, we need a modular way of knowing if there are 
-                    // any parts of the system that are dependant on it
-                    // DisposeSsdpHandler();
-                }
-                return;
-            }
-
             if (!_ssdpHandlerStarted)
             {
                 StartSsdpHandler();
@@ -231,7 +219,7 @@ namespace MediaBrowser.Dlna.Main
                 return;
             }
 
-            var cacheLength = _config.GetDlnaConfiguration().BlastAliveMessageIntervalSeconds*2;
+            var cacheLength = _config.GetDlnaConfiguration().BlastAliveMessageIntervalSeconds * 2;
             _Publisher.SupportPnpRootDevice = true;
 
             foreach (var address in await _appHost.GetLocalIpAddresses().ConfigureAwait(false))

MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs

@@ -106,7 +106,14 @@ namespace MediaBrowser.Server.Implementations.IO
 
             if (refreshPath)
             {
-                ReportFileSystemChanged(path);
+                try
+                {
+                    ReportFileSystemChanged(path);
+                }
+                catch (Exception ex)
+                {
+                    Logger.ErrorException("Error in ReportFileSystemChanged for {0}", ex, path);
+                }
             }
         }
 

MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs

@@ -349,9 +349,14 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
                     channelNumber = channelNumber.TrimStart('0');
 
                     _logger.Debug("Found channel: " + channelNumber + " in Schedules Direct");
-                    var schChannel = root.stations.FirstOrDefault(item => item.stationID == map.stationID);
-
-                    AddToChannelPairCache(listingsId, channelNumber, schChannel);
+                    if (root.stations != null)
+                    {
+                        var schChannel = root.stations.FirstOrDefault(item => string.Equals(item.stationID, map.stationID, StringComparison.OrdinalIgnoreCase));
+                        if (schChannel != null)
+                        {
+                            AddToChannelPairCache(listingsId, channelNumber, schChannel);
+                        }
+                    }
                 }
                 _logger.Info("Added " + GetChannelPairCacheCount(listingsId) + " channels to the dictionary");
 

MediaBrowser.WebDashboard/Api/PackageCreator.cs

@@ -346,7 +346,7 @@ namespace MediaBrowser.WebDashboard.Api
 
             if (string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase))
             {
-                sb.Append("<meta http-equiv=\"Content-Security-Policy\" content=\"default-src * 'self' 'unsafe-inline' 'unsafe-eval' data: gap: file: filesystem:; connect-src ws: *\">");
+                sb.Append("<meta http-equiv=\"Content-Security-Policy\" content=\"default-src * 'self' 'unsafe-inline' 'unsafe-eval' data: gap: file: filesystem:;\">");
             }
             else
             {