1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

fix merge conflict

This commit is contained in:
Luke Pulverenti 2015-11-20 23:56:21 -05:00
parent 5e2416a5d3
commit 5736f100aa

View file

@ -850,7 +850,7 @@
Dashboard.showModalLoadingMsg();
}
if (options.startPositionTicks || firstItem.MediaType !== 'Video' || !AppSettings.enableCinemaMode()) {
if (options.startPositionTicks || firstItem.MediaType !== 'Video') {
self.playInternal(firstItem, options.startPositionTicks, function () {
self.setPlaylistState(0, items);