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

Merge pull request #2173 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-09-15 16:36:06 -04:00 committed by GitHub
commit a1bc21077d
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MediaBrowser.Dlna/Main/DlnaEntryPoint.cs
View File

@ -110,18 +110,6 @@ namespace MediaBrowser.Dlna.Main
{ {
var options = _config.GetDlnaConfiguration(); 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) if (!_ssdpHandlerStarted)
{ {
StartSsdpHandler(); StartSsdpHandler();

7
MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
View File

@ -105,9 +105,16 @@ namespace MediaBrowser.Server.Implementations.IO
_tempIgnoredPaths.TryRemove(path, out val); _tempIgnoredPaths.TryRemove(path, out val);
if (refreshPath) if (refreshPath)
{
try
{ {
ReportFileSystemChanged(path); ReportFileSystemChanged(path);
} }
catch (Exception ex)
{
Logger.ErrorException("Error in ReportFileSystemChanged for {0}", ex, path);
}
}
} }
/// <summary> /// <summary>

9
MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
View File

@ -349,10 +349,15 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
channelNumber = channelNumber.TrimStart('0'); channelNumber = channelNumber.TrimStart('0');
_logger.Debug("Found channel: " + channelNumber + " in Schedules Direct"); _logger.Debug("Found channel: " + channelNumber + " in Schedules Direct");
var schChannel = root.stations.FirstOrDefault(item => item.stationID == map.stationID); 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); AddToChannelPairCache(listingsId, channelNumber, schChannel);
} }
}
}
_logger.Info("Added " + GetChannelPairCacheCount(listingsId) + " channels to the dictionary"); _logger.Info("Added " + GetChannelPairCacheCount(listingsId) + " channels to the dictionary");
foreach (ChannelInfo channel in channels) foreach (ChannelInfo channel in channels)

2
MediaBrowser.WebDashboard/Api/PackageCreator.cs
View File

@ -346,7 +346,7 @@ namespace MediaBrowser.WebDashboard.Api
if (string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase)) 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 else
{ {