From 5736f100aa927ebd34ea396d8c910a8c1b7617be Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 20 Nov 2015 23:56:21 -0500
Subject: [PATCH] fix merge conflict

---
 dashboard-ui/scripts/mediaplayer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index d5fd0684f..6d34d11ce 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -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);