Compare commits

..

No commits in common. "0e06f5457ca6df8d2c27ece50f462f28ac85c3ff" and "04e40a8370fa01f9834aa05f8a273271692a87f5" have entirely different histories.

4 changed files with 2 additions and 15 deletions

View file

@ -210,15 +210,8 @@ static BOOL consentLastEnabled = NO;
[playlistLoader addDatabase];
} else if([[NSFileManager defaultManager] fileExistsAtPath:[basePath stringByAppendingPathComponent:newFilename]]) {
[playlistLoader addURL:[NSURL fileURLWithPath:[basePath stringByAppendingPathComponent:newFilename]]];
} else if([[NSFileManager defaultManager] fileExistsAtPath:[basePath stringByAppendingPathComponent:oldFilename]]){
/* Without the above check, it appears the code was retrieving a nil NSURL from the nonexistent path
* Then adding it to the playlist and crashing further down the line
* Nobody on a new setup should be seeing this open anything, so it should fall through to the
* notice below.
*/
[playlistLoader addURL:[NSURL fileURLWithPath:[basePath stringByAppendingPathComponent:oldFilename]]];
} else {
ALog(@"No playlist found, leaving it empty.");
[playlistLoader addURL:[NSURL fileURLWithPath:[basePath stringByAppendingPathComponent:oldFilename]]];
}
}

View file

@ -52,10 +52,6 @@
}
- (BOOL)open:(NSURL *)url withOutputFormat:(AudioStreamBasicDescription)outputFormat withUserInfo:(id)userInfo withRGInfo:(NSDictionary *)rgi {
if(!url) {
DLog(@"Player attempted to play invalid file...");
return NO;
}
[self setStreamURL:url];
[self setUserInfo:userInfo];

View file

@ -1112,7 +1112,6 @@ NSURL *_Nullable urlForPath(NSString *_Nullable path);
}
- (NSArray *)addURL:(NSURL *)url {
if(!url) return [NSArray array];
return [self insertURLs:@[url] atIndex:(int)[[playlistController content] count] sort:NO];
}

View file

@ -420,7 +420,6 @@ static inline void dispatch_async_reentrant(dispatch_queue_t queue, dispatch_blo
}
- (const void *)beginFolderAccess:(NSURL *)fileUrl {
if(!fileUrl) return NULL;
NSURL *folderUrl = [SandboxBroker urlWithoutFragment:fileUrl];
if(![folderUrl isFileURL]) return NULL;