Ensure the current preference panel and main content controller recei…

…ve viewWill/DidAppear notifications when the windows become key.
OpenEmu · Dec 29, 2013 · 8e1b973 · 8e1b973
1 parent 271e3a7
commit 8e1b973
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/OpenEmu/OEMainWindowController.m b/OpenEmu/OEMainWindowController.m
@@ -366,6 +366,12 @@ - (void)windowWillClose:(NSNotification *)notification
     [self setCurrentContentController:nil];
 }
 
+- (void)windowDidBecomeKey:(NSNotification *)notification
+{
+    [[self currentContentController] viewWillAppear];
+    [[self currentContentController] viewDidAppear];
+}
+
 - (void)windowDidBecomeMain:(NSNotification *)notification
 {
     NSMenu *mainMenu = [NSApp mainMenu];

diff --git a/OpenEmu/OEPreferencesController.m b/OpenEmu/OEPreferencesController.m
@@ -160,10 +160,14 @@ - (NSRect)window:(NSWindow *)window willPositionSheet:(NSWindow *)sheet usingRec
 - (void)windowWillClose:(NSNotification *)notification
 {
     [[self selectedPreferencePane] viewWillDisappear];
+    [[self selectedPreferencePane] viewDidDisappear];
 }
 
 - (void)windowDidBecomeKey:(NSNotification *)notification
 {
+    [[self selectedPreferencePane] viewWillAppear];
+    [[self selectedPreferencePane] viewDidAppear];
+
     _konamiCodeIndex = 0;
     _konamiCodeMonitor = [NSEvent addLocalMonitorForEventsMatchingMask:NSKeyDownMask handler:^NSEvent *(NSEvent *e) {
         if([e keyCode] == konamiCode[_konamiCodeIndex])