Fixed crash with removing observer of layer.sublayers.

tappytaps · Mar 27, 2018 · 3c62509 · 3c62509
1 parent 7fbbc79
commit 3c62509
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git a/DBDebugToolkit/Classes/DBDebugToolkit.m b/DBDebugToolkit/Classes/DBDebugToolkit.m
@@ -141,7 +141,6 @@ - (void)newKeyWindowNotification:(NSNotification *)notification {
 - (void)windowDidResignKeyNotification:(NSNotification *)notification {
     UIWindow *windowResigningKey = notification.object;
     [self removeTriggersFromWindow:windowResigningKey];
-    [self.performanceToolkit windowDidResignKey:windowResigningKey];
 }
 
 #pragma mark - Performance toolkit

diff --git a/DBDebugToolkit/Classes/Performance/DBPerformanceToolkit.h b/DBDebugToolkit/Classes/Performance/DBPerformanceToolkit.h
@@ -149,13 +149,6 @@
  */
 - (void)updateKeyWindow:(UIWindow *)window;
 
-/**
- Removes the widget from the old key window.
- 
- @param window The window that resigned key. It should have the widget removed.
- */
-- (void)windowDidResignKey:(UIWindow *)window;
-
 /**
  Returns time in seconds between the measurements.
  */

diff --git a/DBDebugToolkit/Classes/Performance/DBPerformanceToolkit.m b/DBDebugToolkit/Classes/Performance/DBPerformanceToolkit.m
@@ -100,6 +100,7 @@ - (void)setIsWidgetShown:(BOOL)isWidgetShown {
 }
 
 - (void)addWidgetToWindow:(UIWindow *)window {
+    [self.widget.superview removeObserver:self forKeyPath:@"layer.sublayers"];
     [window addSubview:self.widget];
     // We observe the "layer.sublayers" property of the window to keep the widget on top.
     [window addObserver:self
@@ -112,14 +113,9 @@ - (void)updateKeyWindow:(UIWindow *)window {
     [self addWidgetToWindow:window];
 }
 
-- (void)windowDidResignKey:(UIWindow *)window {
-    [window removeObserver:self forKeyPath:@"layer.sublayers"];
-}
-
 -(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
     // We want to keep the widget on top of all the views.
-    UIWindow *keyWindow = [UIApplication sharedApplication].keyWindow;
-    [keyWindow bringSubviewToFront:self.widget];
+    [self.widget.superview bringSubviewToFront:self.widget];
 }
 
 #pragma mark - Performance Measurement