Skip to content
Snippets Groups Projects
Commit 53c6fdd4 authored by Duncan McNamara's avatar Duncan McNamara Committed by Nicolas Pomepuy
Browse files

TvBrowser: check FORCE_PLAY_ALL before play

parent 6a45d2c3
No related branches found
Tags 3.2.0-b1
1 merge request!1485TvBrowser: check FORCE_PLAY_ALL before play
Pipeline #252464 passed with stage
in 21 minutes and 35 seconds
......@@ -46,7 +46,9 @@ import org.videolan.television.ui.audioplayer.AudioPlayerActivity
import org.videolan.television.ui.browser.TVActivity
import org.videolan.television.ui.browser.VerticalGridActivity
import org.videolan.television.ui.details.MediaListActivity
import org.videolan.tools.FORCE_PLAY_ALL
import org.videolan.tools.HttpImageLoader
import org.videolan.tools.Settings
import org.videolan.tools.getposition
import org.videolan.vlc.R
import org.videolan.vlc.gui.DialogActivity
......@@ -202,9 +204,13 @@ object TvUtil {
}
else -> {
model.run {
val list = (dataset.getList().filterIsInstance<MediaWrapper>()).filter { it.type != MediaWrapper.TYPE_DIR }
val position = list.getposition(item)
MediaUtils.openList(activity, list, position)
if (!Settings.getInstance(activity).getBoolean(FORCE_PLAY_ALL, false)) {
MediaUtils.openMedia(activity, item)
} else {
val list = (dataset.getList().filterIsInstance<MediaWrapper>()).filter { it.type != MediaWrapper.TYPE_DIR }
val position = list.getposition(item)
MediaUtils.openList(activity, list, position)
}
}
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment