diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-30 13:31:31 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-30 13:51:20 -0500 |
| commit | c957ca936f76f6a25af8398feca9f9d1d18e2685 (patch) | |
| tree | 40cefe1118730235061dcab525bd71b84054c8e5 | |
| parent | fae9b184810ec81de92e6d14b8043b37c085de9e (diff) | |
update components
Conflicts:
MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js
| -rw-r--r-- | MediaBrowser.Api/Playback/MediaInfoService.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/MediaBrowser.Api/Playback/MediaInfoService.cs b/MediaBrowser.Api/Playback/MediaInfoService.cs index 3b577ac01..2bf61f90b 100644 --- a/MediaBrowser.Api/Playback/MediaInfoService.cs +++ b/MediaBrowser.Api/Playback/MediaInfoService.cs @@ -141,10 +141,10 @@ namespace MediaBrowser.Api.Playback var profile = request.DeviceProfile; - var caps = _deviceManager.GetCapabilities(authInfo.DeviceId); - if (caps != null) + if (profile == null) { - if (profile == null) + var caps = _deviceManager.GetCapabilities(authInfo.DeviceId); + if (caps != null) { profile = caps.DeviceProfile; } diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index cc153a010..a3788ef6c 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -311,9 +311,6 @@ <Content Include="dashboard-ui\scripts\supporterkeypage.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
- <Content Include="dashboard-ui\components\testermessage.js">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
<Content Include="dashboard-ui\scripts\wizardlivetvguide.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
|