Skip to content

Update video list display & watch page to not use stored watch progress when progress saving disabled #3453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FreeTubeBot merged 1 commit into from
Apr 20, 2023
Merged

Update video list display & watch page to not use stored watch progress when progress saving disabled #3453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/renderer/components/ft-list-video/ft-list-video.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,10 @@ export default defineComponent({

if (historyIndex !== -1) {
this.watched = true
this.watchProgress = this.historyCache[historyIndex].watchProgress
if (this.saveWatchedProgress) {
// For UX consistency, no progress reading if writing disabled
this.watchProgress = this.historyCache[historyIndex].watchProgress
}

if (this.historyCache[historyIndex].published !== '') {
const videoPublished = this.historyCache[historyIndex].published
Expand Down
3 changes: 2 additions & 1 deletion src/renderer/views/Watch/Watch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,7 +944,8 @@ export default defineComponent({
} else {
this.$refs.videoPlayer.player.currentTime(this.timestamp)
}
} else if (historyIndex !== -1) {
} else if (this.saveWatchedProgress && historyIndex !== -1) {
// For UX consistency, no progress reading if writing disabled
const watchProgress = this.historyCache[historyIndex].watchProgress

if (watchProgress < (this.videoLengthSeconds - 10)) {
Expand Down