Merge pull request #19 from maxxfrazer/weak

- Set ARView reference to weak
maxxfrazer · Apr 1, 2021 · a8de187 · a8de187
2 parents 9975eb6 + 27982ea
commit a8de187
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/Sources/FocusEntity/FocusEntity.swift b/Sources/FocusEntity/FocusEntity.swift
@@ -53,7 +53,7 @@ open class FocusEntity: Entity, HasAnchoring, HasFocusEntity {
     self.arView?.scene
   }
 
-  internal var arView: ARView?
+  internal weak var arView: ARView?
 
   /// For moving the FocusEntity to a whole new ARView
   /// - Parameter view: The destination `ARView`
@@ -83,18 +83,15 @@ open class FocusEntity: Entity, HasAnchoring, HasFocusEntity {
   public private(set) var isAutoUpdating: Bool = false
 
   public func setAutoUpdate(to autoUpdate: Bool) {
-    if autoUpdate == self.isAutoUpdating {
-      return
-    }
-    if self.arView == nil {
+    guard autoUpdate == self.isAutoUpdating,
+          (autoUpdate && self.arView == nil) else {
       return
     }
+    self.updateCancellable?.cancel()
     if autoUpdate {
       self.updateCancellable = self.myScene?.subscribe(
         to: SceneEvents.Update.self, self.updateFocusEntity
       )
-    } else {
-      self.updateCancellable?.cancel()
     }
     self.isAutoUpdating = autoUpdate
   }