diff --git a/Application/AppController.m b/Application/AppController.m index 75a6781e9..f041c190c 100644 --- a/Application/AppController.m +++ b/Application/AppController.m @@ -225,7 +225,7 @@ static AppController *kAppController = nil; NSError *error = nil; NSArray *results = [playlistController.persistentContainer.viewContext executeFetchRequest:request error:&error]; - if(results && [results count] == 1) { + if(results && [results count] > 0) { PlaylistEntry *pe = results[0]; if([[NSUserDefaults standardUserDefaults] boolForKey:@"resumePlaybackOnStartup"]) { [playbackController playEntryAtIndex:pe.index startPaused:(lastStatus == CogStatusPaused) andSeekTo:@(pe.currentPosition)]; @@ -236,6 +236,13 @@ static AppController *kAppController = nil; pe.countAdded = NO; [playlistController commitPersistentStore]; } + // Bug fix + if([results count] > 1) { + for(size_t i = 1; i < [results count]; ++i) { + PlaylistEntry *pe = results[i]; + [pe setCurrent:NO]; + } + } } }