From fd28f9e321e750f934d654cb1960f1de0be55b26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= <renaudeau.gaetan@gmail.com>
Date: Mon, 28 Dec 2015 22:10:02 +0100
Subject: [PATCH] simplify the logic in drawRect

---
 ios/GLCanvas.m | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/ios/GLCanvas.m b/ios/GLCanvas.m
index 5600ffa..764b2f4 100644
--- a/ios/GLCanvas.m
+++ b/ios/GLCanvas.m
@@ -113,7 +113,6 @@ RCT_NOT_IMPLEMENTED(-init)
 {
   if (autoRedraw) {
     if (!animationTimer)
-      animationTimer = // FIXME: can we do better than this?
       [NSTimer scheduledTimerWithTimeInterval:1.0/60.0
                                        target:self
                                      selector:@selector(setNeedsDisplay)
@@ -306,6 +305,7 @@ RCT_NOT_IMPLEMENTED(-init)
     contentData[i] = imgData;
   }
   _contentData = contentData;
+  _deferredRendering = false;
   [self setNeedsDisplay];
   RCT_PROFILE_END_EVENT(0, @"gl", nil);
 }
@@ -335,7 +335,7 @@ RCT_NOT_IMPLEMENTED(-init)
 - (void)drawRect:(CGRect)rect
 {
   self.layer.opaque = _opaque;
-  
+
   if (_neverRendered) {
     _neverRendered = false;
     glClearColor(0.0, 0.0, 0.0, 0.0);
@@ -350,14 +350,15 @@ RCT_NOT_IMPLEMENTED(-init)
     return;
   }
   
-  BOOL needsDeferredRendering = [_nbContentTextures intValue] > 0 && !_autoRedraw;
-  if (needsDeferredRendering && !_deferredRendering) {
+  bool willRender = !_deferredRendering;
+  
+  if ([_nbContentTextures intValue] > 0) {
     _deferredRendering = true;
     [self performSelectorOnMainThread:@selector(syncContentData) withObject:nil waitUntilDone:NO];
   }
-  else {
+  
+  if (willRender) {
     [self render];
-    _deferredRendering = false;
     if (_captureFrameRequested) {
       _captureFrameRequested = false;
       [self performSelectorOnMainThread:@selector(capture) withObject:nil waitUntilDone:NO];
-- 
2.26.2