Skip to content
Merged
Changes from all commits
Commits
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
13 changes: 11 additions & 2 deletions Application/AppController.m
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ - (void)awakeFromNib {
int lastStatus = (int)[[NSUserDefaults standardUserDefaults] integerForKey:@"lastPlaybackStatus"];

if(lastStatus != CogStatusStopped) {
BOOL resumePlaybackOnStartup = [[NSUserDefaults standardUserDefaults] boolForKey:@"resumePlaybackOnStartup"];
NSPredicate *hasUrlPredicate = [NSPredicate predicateWithFormat:@"urlString != nil && urlString != %@", @""];
NSPredicate *deletedPredicate = [NSPredicate predicateWithFormat:@"deLeted == NO || deLeted == nil"];
NSPredicate *currentPredicate = [NSPredicate predicateWithFormat:@"current == YES"];
Expand All @@ -261,12 +262,20 @@ - (void)awakeFromNib {
PlaylistEntry *pe = results[0];
// Select this track
[playlistView selectRowIndexes:[NSIndexSet indexSetWithIndex:pe.index] byExtendingSelection:NO];
if([[NSUserDefaults standardUserDefaults] boolForKey:@"resumePlaybackOnStartup"]) {
if(resumePlaybackOnStartup) {
// And play it
[playbackController playEntryAtIndex:pe.index startPaused:(lastStatus == CogStatusPaused) andSeekTo:@(pe.currentPosition)];
} else {
// Startup resume is disabled, so clear stale "currently playing" markers from the last run.
for(PlaylistEntry *entry in results) {
entry.current = NO;
entry.stopAfter = NO;
}
[playlistController commitPersistentStore];
[playlistView reloadData];
}
// Bug fix
if([results count] > 1) {
if(resumePlaybackOnStartup && [results count] > 1) {
for(size_t i = 1; i < [results count]; ++i) {
PlaylistEntry *pe = results[i];
[pe setCurrent:NO];
Expand Down