Adds a convenience method to safely perform a block unless the future…

… has been cancelled.
robrix · Feb 11, 2012 · e3358e7 · e3358e7
1 parent 605c437
commit e3358e7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/RXFutures/RXFuture.h b/RXFutures/RXFuture.h
@@ -23,6 +23,8 @@
 
 -(void)performBlock:(void(^)())block;
 
+-(void)unlessCancelled:(void(^)())block;
+
 // these properties are only meaningful and safe within blocks passed to -performBlock:
 @property (nonatomic, readonly, assign, getter=isCancelled) BOOL cancelled;
 @property (nonatomic, readonly, assign, getter=isCompleted) BOOL completed;

diff --git a/RXFutures/RXFuture.m b/RXFutures/RXFuture.m
@@ -37,12 +37,6 @@ -(void)dispatchCallback:(void(^)())block {
 }
 
 
--(void)performBlock:(void(^)())block
-{
-	dispatch_async(queue, block);
-}
-
-
 -(void)onCancel:(void(^)())block {
 	[self performBlock:^{
 		if(cancelled)
@@ -94,4 +88,16 @@ -(void)complete:(void(^)())block {
 	[self complete];
 }
 
+
+-(void)performBlock:(void(^)())block {
+	dispatch_async(queue, block);
+}
+
+
+-(void)unlessCancelled:(void(^)())block {
+	[self performBlock:^{
+		if(!cancelled) block();
+	}];
+}
+
 @end