Fixed freezing/crashing with previous commit.

Fix.
WilliamLCobb · Sep 23, 2016 · 505ab19 · 505ab19
1 parent 8b889f4
commit 505ab19
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/iNDS/iNDSEmulatorViewController.mm b/iNDS/iNDSEmulatorViewController.mm
@@ -199,6 +199,7 @@ - (void)viewDidLoad
     [notificationCenter addObserver:self selector:@selector(screenChanged:) name:UIScreenDidDisconnectNotification object:nil];
     [notificationCenter addObserver:self selector:@selector(controllerActivated:) name:GCControllerDidConnectNotification object:nil];
     [notificationCenter addObserver:self selector:@selector(controllerDeactivated:) name:GCControllerDidDisconnectNotification object:nil];
+    [[NSUserDefaults standardUserDefaults] addObserver:self forKeyPath:@"mirrorDisplay" options:NSKeyValueObservingOptionNew context:NULL];
 
     if ([[GCController controllers] count] > 0) {
         [self controllerActivated:nil];
@@ -338,6 +339,13 @@ - (void)loadProfile:(iNDSEmulationProfile *)profile
 
 }
 
+-(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
+{
+    if([keyPath isEqual: @"mirrorDisplay"] && emuLoopLock) {
+        [self performSelector:@selector(screenChanged:)];
+    }
+}
+
 - (void)defaultsChanged:(NSNotification*)notification
 {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
@@ -354,9 +362,6 @@ - (void)defaultsChanged:(NSNotification*)notification
         int filterTranslate[] = {NONE, EPX, SUPEREAGLE, _2XSAI, SUPER2XSAI, BRZ2x, LQ2X, BRZ3x, HQ2X, HQ4X, BRZ4x, BRZ5x};
         NSInteger filter = [[NSUserDefaults standardUserDefaults] integerForKey:@"videoFilter"];
         EMU_setFilter(filterTranslate[filter]);
-
-        // Mirror Display
-        [self performSelector:@selector(screenChanged:) withObject:notification];
     }
     self.directionalControl.style = [defaults integerForKey:@"controlPadStyle"];
     self.fpsLabel.hidden = ![defaults integerForKey:@"showFPS"];
@@ -418,6 +423,7 @@ - (void)dealloc
 {
     EMU_closeRom();
     [[NSNotificationCenter defaultCenter] removeObserver:self];
+    [[NSUserDefaults standardUserDefaults] removeObserver:self forKeyPath:@"mirrorDisplay"];
 }
 
 - (void)screenChanged:(NSNotification*)notification