Merge branch 'itomych-master'

bellchen · Sep 21, 2015 · 3a76cdf · 3a76cdf
2 parents 5d8a0f6 + ef45369
commit 3a76cdf
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Source/DZNSegmentedControl.m b/Source/DZNSegmentedControl.m
@@ -429,11 +429,11 @@ - (void)setItems:(NSArray *)items
 
     id firstItem = [items firstObject];
 
-    NSPredicate *classPredicate = [NSPredicate predicateWithFormat:@"self isKindOfClass: %@", [firstItem class]];
-    NSAssert([items filteredArrayUsingPredicate:classPredicate].count == items.count, @"Cannot include different objects in the array. Please make sure to either pass an array of NSString or UIImage objects.");
-
     _imageMode = [firstItem isKindOfClass:[UIImage class]];
 
+    NSPredicate *classPredicate = [NSPredicate predicateWithFormat:@"self isKindOfClass: %@", _imageMode ? [UIImage class] : [NSString class]];
+    NSAssert([items filteredArrayUsingPredicate:classPredicate].count == items.count, @"Cannot include different objects in the array. Please make sure to either pass an array of NSString or UIImage objects.");
+
     _items = [NSArray arrayWithArray:items];
 
     if (!self.imageMode) {
@@ -727,7 +727,7 @@ - (void)setDisplayCount:(BOOL)count
 
 - (void)setFont:(UIFont *)font
 {
-    if ([self.font.fontName isEqualToString:font.fontName]) {
+    if ( [self.font.fontName isEqualToString:font.fontName] && self.font.pointSize == font.pointSize ) {
         return;
     }