Merge branch 'develop_1.5' of https://stash.tcsbank.ru/scm/mtip/asdk-ios

into develop_1.5 * 'develop_1.5' of https://stash.tcsbank.ru/scm/mtip/asdk-ios: Prevent double cancelling Invoke a completion closure on canceled
tinkoff-mobile-tech · Apr 28, 2020 · 4b81578 · 4b81578
2 parents bbf026e + 0e7f381
commit 4b81578
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/ASDKUI/Payment/PaymentViewController/ASDKPaymentFormViewController.m b/ASDKUI/Payment/PaymentViewController/ASDKPaymentFormViewController.m
@@ -251,6 +251,7 @@ - (void)viewWillDisappear:(BOOL)animated
 		if (self.onCancelled)
 		{
 			self.onCancelled();
+            self.onCancelled = nil;
 		}
 	}
 }
@@ -528,7 +529,11 @@ - (void)setSelectedCard:(ASDKCard *)selectedCard
 - (IBAction)cancelAction:(id)sender
 {
     [self closeSelfWithCompletion:^{
-
+        if (self.onCancelled)
+        {
+            self.onCancelled();
+            self.onCancelled = nil;
+        }
     }];
 }
 
@@ -1463,7 +1468,13 @@ - (void)cardListDidChanged
 
 - (void)presentationControllerDidDismiss:(UIPresentationController *)presentationController
 {
-    [self closeSelfWithCompletion:self.onCancelled];
+    [self closeSelfWithCompletion:^{
+        if (self.onCancelled)
+        {
+            self.onCancelled();
+            self.onCancelled = nil;
+        }
+    }];
 }
 
 @end