Skip to content
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

Episode resume crash #193

Closed
wants to merge 9 commits into from
Closed

Episode resume crash #193

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c0b22a1
Merge pull request #1 from elementary/master
Apr 17, 2020
e8d6147
Episode resume crash from playlist clearing
Apr 19, 2020
c1ae00c
Merge branch 'master' into episode_resume_crash
Apr 23, 2020
b3d46c5
Merge branch 'master' into episode_resume_crash
Apr 23, 2020
d3cb699
Merge branch 'master' into episode_resume_crash
May 1, 2020
b23f864
Merge branch 'master' into episode_resume_crash
May 25, 2020
796f7d6
Merge branch 'master' into episode_resume_crash
Jun 16, 2020
806ac06
Merge branch 'master' into episode_resume_crash
May 6, 2021
67ce09b
Merge branch 'master' into episode_resume_crash
danirabbit Jun 1, 2021
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
9 changes: 5 additions & 4 deletions src/Widgets/Library/EpisodesPage.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,11 @@ namespace Audience {
var video = selected.episodes.first ();
if (video.video_file.query_exists ()) {
string uri = video.video_file.get_uri ();
bool from_beginning = uri != settings.get_string ("current-video");
var window = App.get_instance ().mainwindow;// Clean playlist
window.clear_playlist ();
window.add_to_playlist (uri, false);
bool same_video = uri == settings.get_string ("current-video");
bool playback_complete = settings.get_double ("last-stopped") == 0.0;
bool from_beginning = !same_video || playback_complete;
var window = App.get_instance ().mainwindow;
window.add_to_playlist (uri, same_video);
window.play_file (uri, Window.NavigationPage.EPISODES, from_beginning);
if (window.autoqueue_next_active ()) {
// Add next from the current view to the queue
Expand Down