diff options
| author | tikuf <admin@nyalindee.com> | 2014-03-25 16:09:30 +1100 |
|---|---|---|
| committer | tikuf <admin@nyalindee.com> | 2014-03-25 16:09:30 +1100 |
| commit | 520b77a098a5f3755c098636821a7ff3742a055f (patch) | |
| tree | b347c31d1333520350422c3e3a08cea292fc8093 /MediaBrowser.Server.Implementations | |
| parent | 72bd678b9736ed0cdd8afea90e7e0c91c5b9b4c9 (diff) | |
| parent | a94a98dc6c1381c177a407139769e0cad566346b (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Server.Implementations')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Dto/DtoService.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs index 66a9284d7..1833b708f 100644 --- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs +++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs @@ -741,6 +741,7 @@ namespace MediaBrowser.Server.Implementations.Dto { dto.LockedFields = item.LockedFields; dto.LockData = item.IsLocked; + dto.ForcedSortName = item.ForcedSortName; } var hasBudget = item as IHasBudget; diff --git a/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs b/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs index ad2852a91..098d1295f 100644 --- a/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs +++ b/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs @@ -88,7 +88,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints CreateRules(device); } - catch (Exception ex) + catch (Exception) { //_logger.ErrorException("Error creating port forwarding rules", ex); } |