diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-03-26 15:21:34 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-03-26 15:21:34 -0400 |
| commit | 6a5b64bcb4764eb9cf68fd61960f0f5bb558ecd4 (patch) | |
| tree | aab1c6f4a44cd2ed75c5ef949ad13de0940d1eec | |
| parent | 6ac7675c15af7cf5ea2aaed6c9e329af7eb62c44 (diff) | |
| parent | 4a8fbad50f9b430a79ebcfb9262ad0d51b615b61 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.Dlna/DlnaManager.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MediaBrowser.Dlna/DlnaManager.cs b/MediaBrowser.Dlna/DlnaManager.cs index 6582b4ee5..e40b085fd 100644 --- a/MediaBrowser.Dlna/DlnaManager.cs +++ b/MediaBrowser.Dlna/DlnaManager.cs @@ -127,6 +127,12 @@ namespace MediaBrowser.Dlna private bool IsMatch(DeviceIdentification deviceInfo, DeviceIdentification profileInfo) { + if (profileInfo == null) + { + //There are profiles without identification, ignore thoose + return false; + } + if (!string.IsNullOrWhiteSpace(profileInfo.DeviceDescription)) { if (deviceInfo.DeviceDescription == null || !Regex.IsMatch(deviceInfo.DeviceDescription, profileInfo.DeviceDescription)) |