Skip PreRenderScene and ClearScene if it is not initialized

Change-Id: Ice54353a8f7441525ca5e7ba717a9ed021781f96
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>

diff --git a/dali/internal/render/common/render-manager.cpp b/dali/internal/render/common/render-manager.cpp
index a8e86eebbbb0a1c33cc7a2fdb03b4b8732e745f4..79d18e860c4641d35d05b13671bdb999b5e2b5cc 100644 (file)
--- a/dali/internal/render/common/render-manager.cpp
+++ b/dali/internal/render/common/render-manager.cpp
@@ -705,10 +705,10 @@ void RenderManager::PreRenderScene(Integration::Scene& scene, Integration::Scene
   Internal::Scene& sceneInternal = GetImplementation(scene);
   Scene*           sceneObject   = sceneInternal.GetSceneObject();
 
-  if(!sceneObject)
+  if(!sceneObject || !sceneObject->GetSurfaceRenderTarget())
   {
     // May not be a scene object if the window is being removed.
-    DALI_LOG_ERROR("Scene was empty handle. Skip PreRenderScene\n");
+    DALI_LOG_ERROR("Scene was empty handle, or render target is null. Skip PreRenderScene (scene : %p, renderTarget : %p)\n", sceneObject, sceneObject ? sceneObject->GetSurfaceRenderTarget() : nullptr);
     return;
   }
 
@@ -1434,9 +1434,10 @@ void RenderManager::ClearScene(Integration::Scene scene)
 {
   Internal::Scene&   sceneInternal = GetImplementation(scene);
   SceneGraph::Scene* sceneObject   = sceneInternal.GetSceneObject();
-  if(!sceneObject)
+  if(!sceneObject || !sceneObject->GetSurfaceRenderTarget())
   {
-    DALI_LOG_ERROR("Scene was empty handle. Skip ClearScene\n");
+    // May not be a scene object if the window is being removed.
+    DALI_LOG_ERROR("Scene was empty handle, or render target is null. Skip ClearScene (scene : %p, renderTarget : %p)\n", sceneObject, sceneObject ? sceneObject->GetSurfaceRenderTarget() : nullptr);
     return;
   }