Permalink
Browse files

Fix crash when closing frame while fullscreen

Reported by Joseph Perez
  • Loading branch information...
1 parent 7a687bf commit cdc12d6d0bb84577809644da3eaeae113c544e9f @davidswelt davidswelt committed Oct 13, 2013
Showing with 5 additions and 0 deletions.
  1. +5 −0 src/nsterm.m
View
@@ -1160,6 +1160,7 @@ Free a pool and temporary objects it refers to (callable from C)
}
xfree (f->output_data.ns);
+ f->output_data.ns = 0;
[[view window] close];
[view release];
@@ -6411,6 +6412,10 @@ - (NSSize)window:(NSWindow *)window willUseFullScreenContentSize:(NSSize)propose
}
- (void)windowDidExitFullScreen:(NSNotification *)notification {
+
+
+ if (!emacsframe || !emacsframe->output_data.ns || ns_in_resize || ! FRAME_LIVE_P (emacsframe))
+ return;
NSWindow* window = [notification object];

0 comments on commit cdc12d6

Please sign in to comment.