Fix memory leak in reactive gesture recognizer

pakerwreah · Apr 27, 2023 · ca0c69a · ca0c69a
1 parent ddf7654
commit ca0c69a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Calendr/Extensions/NSGestureRecognizer+Rx.swift b/Calendr/Extensions/NSGestureRecognizer+Rx.swift
@@ -32,7 +32,7 @@ extension Reactive where Base: NSView {
 
     private func gesture<T: NSGestureRecognizer>(_ configure: @escaping (T) -> Void) -> Observable<Void> {
 
-        Observable.create { observer in
+        Observable.create { [weak base] observer in
 
             let target = GestureProxy(observer)
 
@@ -43,11 +43,11 @@ extension Reactive where Base: NSView {
 
             configure(click)
 
-            base.addGestureRecognizer(click)
+            base?.addGestureRecognizer(click)
 
             return Disposables.create {
                 _ = target // keep a strong reference
-                base.removeGestureRecognizer(click)
+                base?.removeGestureRecognizer(click)
             }
         }
         .share(replay: 1)