Skip to content
Snippets Groups Projects
Commit 5f259fe3 authored by George Nachman's avatar George Nachman
Browse files

Fix a crash when copying with styles.

Add +[NSObject castFrom:]
parent fe3d97ac
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -19,6 +19,7 @@
@interface NSObject (iTerm)
 
+ (BOOL)object:(NSObject *)a isEqualToObject:(NSObject *)b;
+ (instancetype)castFrom:(id)object;
 
- (void)performSelectorOnMainThread:(SEL)selector withObjects:(NSArray *)objects;
 
Loading
Loading
Loading
Loading
@@ -20,6 +20,14 @@
return [a isEqual:b];
}
 
+ (instancetype)castFrom:(id)object {
if ([object isKindOfClass:[self class]]) {
return object;
} else {
return self;
}
}
- (void)performSelectorWithObjects:(NSArray *)tuple {
SEL selector = NSSelectorFromString(tuple[0]);
NSArray *objects = tuple[1];
Loading
Loading
Loading
Loading
@@ -44,6 +44,7 @@
#import "NSFileManager+iTerm.h"
#import "NSImage+iTerm.h"
#import "NSMutableAttributedString+iTerm.h"
#import "NSObject+iTerm.h"
#import "NSPasteboard+iTerm.h"
#import "NSStringITerm.h"
#import "NSURL+iTerm.h"
Loading
Loading
@@ -3239,7 +3240,8 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
} else {
[theSelectedText appendString:content];
}
if (eol && ![content hasSuffix:@"\n"]) {
NSString *contentString = attributed ? [content string] : content;
if (eol && ![contentString hasSuffix:@"\n"]) {
if (attributed) {
[theSelectedText iterm_appendString:@"\n"];
} else {
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment