Merge "fix prevent bug" into tizen_2.2
authorSukwon Suh <sukwon.suh@samsung.com>
Tue, 25 Jun 2013 04:56:48 +0000 (04:56 +0000)
committerGerrit Code Review <gerrit@gerrit.vlan144.tizendev.org>
Tue, 25 Jun 2013 04:56:48 +0000 (04:56 +0000)
src/graphics/opengl/FGrp_VideoTexture.cpp

index 1f4beb8..46b47de 100644 (file)
@@ -138,12 +138,12 @@ _DamageEvent::Run(void)
 
                            for (int i = 0; i < _VIDEO_TEXTURE_BUFFER_MAX; i++)
                            {
-                                       if (pDamageEvent != null && pDamageEvent->drawable == __pixmap[i])
+                                       if (__pVideoTexture != null && pDamageEvent != null && pDamageEvent->drawable == __pixmap[i])
                                        {
                                                __pVideoTexture->__pBuffer[i].__bufferState = _BUFFER_STATE_ENQUEUE;
                                                SystemTime::GetTicks(__pVideoTexture->__pBuffer[i].__timeStamp);
 
-                                               if (__pVideoTexture != null && __pVideoTexture->__pVideoTextureUpdateListener != null)
+                                               if (__pVideoTexture->__pVideoTextureUpdateListener != null)
                                                {
                                                        int count = __pVideoTexture->__pVideoTextureUpdateListener->GetCount();
                                                        if (count > 0)