瀏覽代碼

library: fixed crash when create folder through drag & drop of 2 MLFile representations

Side note: don't listen on properties you don't care about
Felix Paul Kühne 11 年之前
父節點
當前提交
63801fc15a
共有 2 個文件被更改,包括 2 次插入6 次删除
  1. 1 3
      Sources/VLCPlaylistCollectionViewCell.m
  2. 1 3
      Sources/VLCPlaylistTableViewCell.m

+ 1 - 3
Sources/VLCPlaylistCollectionViewCell.m

@@ -115,7 +115,6 @@
             [_mediaObject removeObserver:self forKeyPath:@"album"];
             [_mediaObject removeObserver:self forKeyPath:@"artist"];
             [_mediaObject removeObserver:self forKeyPath:@"genre"];
-            [_mediaObject removeObserver:self forKeyPath:@"labels"];
             [(MLFile*)_mediaObject didHide];
         }
 
@@ -148,7 +147,6 @@
             [_mediaObject addObserver:self forKeyPath:@"album" options:0 context:nil];
             [_mediaObject addObserver:self forKeyPath:@"artist" options:0 context:nil];
             [_mediaObject addObserver:self forKeyPath:@"genre" options:0 context:nil];
-            [_mediaObject addObserver:self forKeyPath:@"labels" options:0 context:nil];
             [(MLFile*)_mediaObject willDisplay];
         }
     }
@@ -169,7 +167,7 @@
         MLLabel *mediaObject = (MLLabel *)self.mediaObject;
         [self _configureForFolder:mediaObject];
 
-        if ([keyPath isEqualToString:@"files"] || [keyPath isEqualToString:@"labels"] || !keyPath || (!self.thumbnailView.image && [keyPath isEqualToString:@"editing"])) {
+        if ([keyPath isEqualToString:@"files"] || !keyPath || (!self.thumbnailView.image && [keyPath isEqualToString:@"editing"])) {
             if (mediaObject.files.count == 0) {
                 self.thumbnailView.contentMode = UIViewContentModeScaleAspectFit;
                 self.thumbnailView.image = [UIImage imageNamed:@"folderIcon"];

+ 1 - 3
Sources/VLCPlaylistTableViewCell.m

@@ -74,7 +74,6 @@
             [_mediaObject removeObserver:self forKeyPath:@"album"];
             [_mediaObject removeObserver:self forKeyPath:@"artist"];
             [_mediaObject removeObserver:self forKeyPath:@"genre"];
-            [_mediaObject removeObserver:self forKeyPath:@"labels"];
             [(MLFile*)_mediaObject didHide];
         }
 
@@ -107,7 +106,6 @@
             [_mediaObject addObserver:self forKeyPath:@"album" options:0 context:nil];
             [_mediaObject addObserver:self forKeyPath:@"artist" options:0 context:nil];
             [_mediaObject addObserver:self forKeyPath:@"genre" options:0 context:nil];
-            [_mediaObject addObserver:self forKeyPath:@"labels" options:0 context:nil];
             [(MLFile*)_mediaObject willDisplay];
         }
     }
@@ -146,7 +144,7 @@
         MLLabel *mediaObject = (MLLabel *)self.mediaObject;
         [self _configureForFolder:mediaObject];
 
-        if ([keyPath isEqualToString:@"files"] || [keyPath isEqualToString:@"labels"] || !keyPath || (!self.thumbnailView.image && [keyPath isEqualToString:@"editing"])) {
+        if ([keyPath isEqualToString:@"files"] || !keyPath || (!self.thumbnailView.image && [keyPath isEqualToString:@"editing"])) {
             if (mediaObject.files.count == 0) {
                 self.thumbnailView.contentMode = UIViewContentModeScaleAspectFit;
                 self.thumbnailView.image = [UIImage imageNamed:@"folderIcon"];