update components

Conflicts: MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js
9 years ago · c957ca936f
parent fae9b18481
commit c957ca936f
2 changed files with 3 additions and 6 deletions
--- 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;
                }
--- 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>