Cancel compositor task that cannot be completed

sailfishos · Nov 6, 2014 · d760808 · d760808
1 parent c138b7d
commit d760808
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/embedding/embedlite/embedthread/EmbedLiteCompositorParent.cpp b/embedding/embedlite/embedthread/EmbedLiteCompositorParent.cpp
@@ -125,6 +125,7 @@ void
 EmbedLiteCompositorParent::ScheduleTask(CancelableTask* task, int time)
 {
   if (Invalidate()) {
+    task->Cancel();
     CancelCurrentCompositeTask();
   } else {
     CompositorParent::ScheduleTask(task, time);
@@ -138,7 +139,7 @@ EmbedLiteCompositorParent::Invalidate()
   EmbedLiteView* view = EmbedLiteApp::GetInstance()->GetViewByID(mId);
   if (!view) {
     LOGE("view not available.. forgot SuspendComposition call?");
-    return false;
+    return true;
   }
 
   UpdateTransformState();