Changeset 7388
- Timestamp:
- Dec 14, 2008, 4:16:37 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/macosx/GroupsController.m
r7387 r7388 449 449 return NO; 450 450 451 NSArray * rules = [self autoAssignRulesForIndex: index];452 if (!rules || [rules count] == 0)453 return NO;454 455 451 const BOOL needAll = [self rulesNeedAllForIndex: index]; 456 457 NSEnumerator * iterator = [rules objectEnumerator]; 452 BOOL anyPassed = NO; 453 454 NSEnumerator * iterator = [[self autoAssignRulesForIndex: index] objectEnumerator]; 458 455 NSArray * rule = nil; 459 456 while ((rule = [iterator nextObject])) … … 466 463 values = [torrent allTrackers: NO]; 467 464 else 468 NSAssert1(NO, @"\"%@\" - unknown criteria", type); 469 470 BOOL match = NO; 465 continue; 471 466 472 467 NSStringCompareOptions options; … … 478 473 options = NSCaseInsensitiveSearch; 479 474 else 480 NSAssert2(NO, @"\"%@ - %@\" - unknown criteria", type, place); 475 continue; 476 477 BOOL match = NO; 481 478 482 479 NSEnumerator * enumerator = [values objectEnumerator]; 483 480 NSString * value; 484 while ( !match &&(value = [enumerator nextObject]))481 while ((value = [enumerator nextObject])) 485 482 { 486 483 NSRange result = [value rangeOfString: givenValue options: options]; 487 match = result.location != NSNotFound; 484 if (result.location != NSNotFound) 485 { 486 match = YES; 487 anyPassed = YES; 488 break; 489 } 488 490 } 489 491 … … 495 497 } 496 498 497 return needAll;499 return anyPassed && needAll; 498 500 } 499 501
Note: See TracChangeset
for help on using the changeset viewer.