From: Adeel Kazmi Date: Thu, 6 Feb 2020 10:14:35 +0000 (+0000) Subject: Merge "Read Pinch/Rotation environment variables when adaptor begin" into devel/master X-Git-Tag: dali_1.5.0~10 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0f6f62fee6f28a43bac710900bc8d833299c4c24;hp=f0f8e23b63f25f0e0862ef21d21230629b6f9205;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git Merge "Read Pinch/Rotation environment variables when adaptor begin" into devel/master --- diff --git a/dali/internal/system/tizen-wayland/tizen-wearable/capture-impl-tizen.cpp b/dali/internal/system/tizen-wayland/tizen-wearable/capture-impl-tizen.cpp index 0e896c1..0c9487e 100755 --- a/dali/internal/system/tizen-wayland/tizen-wearable/capture-impl-tizen.cpp +++ b/dali/internal/system/tizen-wayland/tizen-wearable/capture-impl-tizen.cpp @@ -263,14 +263,9 @@ void Capture::UnsetRenderTask() mCameraActor.Unparent(); mCameraActor.Reset(); - DALI_ASSERT_ALWAYS(mRenderTask && "RenderTask is NULL."); + DALI_ASSERT_ALWAYS( mRenderTask && "RenderTask is NULL." ); Dali::RenderTaskList taskList = Dali::Stage::GetCurrent().GetRenderTaskList(); - Dali::RenderTask firstTask = taskList.GetTask( 0u ); - - // Stop rendering via frame-buffers as empty handle is used to clear target - firstTask.SetFrameBuffer( Dali::FrameBuffer() ); - taskList.RemoveTask( mRenderTask ); mRenderTask.Reset(); }