Mercurial > hg > orthanc-stone

diff Framework/Scene2D/ZoomSceneTracker.cpp @ 958:769249e1f3b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added guards to prevent calling methods on a dead controller (see comment in diff for expl.) + build fix
author Benjamin Golinvaux <bgo@osimis.io>
date Fri, 23 Aug 2019 10:16:32 +0200
parents e42b491f1fb2
children 2d8ab34c8c91
line wrap: on
line diff
--- a/Framework/Scene2D/ZoomSceneTracker.cpp	Wed Aug 21 16:24:57 2019 +0200
+++ b/Framework/Scene2D/ZoomSceneTracker.cpp	Fri Aug 23 10:16:32 2019 +0200
@@ -76,17 +76,26 @@
 
       double zoom = pow(2.0, z);
 
-      GetController()->SetSceneToCanvasTransform(
-        AffineTransform2D::Combine(
-          AffineTransform2D::CreateScaling(zoom, zoom),
-          originalSceneToCanvas_));
+      // The controller is a weak pointer. It could be deleted when the
+      // tracker is still alive (for instance, because of a lost WebGL
+      // context)
+      if(GetController().get() != NULL)
+      {
+        GetController()->SetSceneToCanvasTransform(
+          AffineTransform2D::Combine(
+            AffineTransform2D::CreateScaling(zoom, zoom),
+            originalSceneToCanvas_));
 
-      aligner_.Apply();
+        aligner_.Apply();
+      }
     }
   }
 
   void ZoomSceneTracker::Cancel()
   {
-    GetController()->SetSceneToCanvasTransform(originalSceneToCanvas_);
+      if(GetController().get() != NULL)
+      {
+        GetController()->SetSceneToCanvasTransform(originalSceneToCanvas_);
+      }
   }
 }