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:
parent
5e2416a5d3
commit
5736f100aa
1 changed files with 1 additions and 1 deletions
|
@ -850,7 +850,7 @@
|
||||||
Dashboard.showModalLoadingMsg();
|
Dashboard.showModalLoadingMsg();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (options.startPositionTicks || firstItem.MediaType !== 'Video' || !AppSettings.enableCinemaMode()) {
|
if (options.startPositionTicks || firstItem.MediaType !== 'Video') {
|
||||||
|
|
||||||
self.playInternal(firstItem, options.startPositionTicks, function () {
|
self.playInternal(firstItem, options.startPositionTicks, function () {
|
||||||
self.setPlaylistState(0, items);
|
self.setPlaylistState(0, items);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue