Merge pull request #225 from cerihughes/fix-latest-crash

JohnSundell · web-flow · commit 3d7e52c0c989 · 2016-12-08T11:50:04.000+01:00
Don’t update state after calling the completion block.
diff --git a/sources/HUBViewModelRenderer.m b/sources/HUBViewModelRenderer.m
@@ -68,6 +68,7 @@ - (void)renderViewModel:(id<HUBViewModel>)viewModel
             [collectionView setNeedsLayout];
             [collectionView layoutIfNeeded];
         }
+        self.lastRenderedViewModel = viewModel;
         completionBlock();
     } else {
         void (^updateBlock)() = ^{
@@ -82,6 +83,7 @@ - (void)renderViewModel:(id<HUBViewModel>)viewModel
                                      addHeaderMargin:addHeaderMargin];
                 
             } completion:^(BOOL finished) {
+                self.lastRenderedViewModel = viewModel;
                 completionBlock();
             }];
         };
@@ -92,8 +94,6 @@ - (void)renderViewModel:(id<HUBViewModel>)viewModel
             [UIView performWithoutAnimation:updateBlock];
         }
     }
-
-    self.lastRenderedViewModel = viewModel;
 }
 
 @end

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ - (void)renderViewModel:(id<HUBViewModel>)viewModel`
`68`	`68`	`[collectionView setNeedsLayout];`
`69`	`69`	`[collectionView layoutIfNeeded];`
`70`	`70`	`}`
	`71`	`+ self.lastRenderedViewModel = viewModel;`
`71`	`72`	`completionBlock();`
`72`	`73`	`} else {`
`73`	`74`	`void (^updateBlock)() = ^{`
`@@ -82,6 +83,7 @@ - (void)renderViewModel:(id<HUBViewModel>)viewModel`
`82`	`83`	`addHeaderMargin:addHeaderMargin];`
`83`	`84`
`84`	`85`	`} completion:^(BOOL finished) {`
	`86`	`+ self.lastRenderedViewModel = viewModel;`
`85`	`87`	`completionBlock();`
`86`	`88`	`}];`
`87`	`89`	`};`
`@@ -92,8 +94,6 @@ - (void)renderViewModel:(id<HUBViewModel>)viewModel`
`92`	`94`	`[UIView performWithoutAnimation:updateBlock];`
`93`	`95`	`}`
`94`	`96`	`}`
`95`		`-`
`96`		`- self.lastRenderedViewModel = viewModel;`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`@end`