Commit dc493958 authored by Carola's avatar Carola Committed by Felix Paul Kühne
Browse files

don't automatically remove folders when the last item is moved out fixes #15118

Manual back-port of f9e5d4f5

Signed-off-by: Felix Paul Kühne's avatarFelix Paul Kühne <fkuehne@videolan.org>
parent 42d24d25
...@@ -1007,16 +1007,9 @@ static NSString *kUsingTableViewToShowData = @"UsingTableViewToShowData"; ...@@ -1007,16 +1007,9 @@ static NSString *kUsingTableViewToShowData = @"UsingTableViewToShowData";
if ([item isKindOfClass:[MLFile class]]) { if ([item isKindOfClass:[MLFile class]]) {
MLFile *file = (MLFile *)item; MLFile *file = (MLFile *)item;
MLLabel *folder = [file.labels anyObject];
[self rearrangeFolderTrackNumbersForRemovedItem:file]; [self rearrangeFolderTrackNumbersForRemovedItem:file];
file.labels = nil; file.labels = nil;
file.folderTrackNumber = nil; file.folderTrackNumber = nil;
if ([folder.files count] == 0) {
[self removeMediaObject:folder updateDatabase:YES];
[self setEditing:NO];
[self backToAllItems:nil];
}
} }
@synchronized(self) { @synchronized(self) {
[_foundMedia removeObject:item]; [_foundMedia removeObject:item];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment