Преглед на файлове

update components

Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js
Luke Pulverenti преди 9 години
родител
ревизия
c957ca936f
променени са 2 файла, в които са добавени 3 реда и са изтрити 6 реда
  1. 3 3
      MediaBrowser.Api/Playback/MediaInfoService.cs
  2. 0 3
      MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj

+ 3 - 3
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;
                 }

+ 0 - 3
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>