diff options
| author | Alan Third | 2017-10-07 16:00:49 +0100 |
|---|---|---|
| committer | Alan Third | 2017-10-07 21:57:16 +0100 |
| commit | 3db0dc21689ae7dbdc697bb5fe45e988cee1f831 (patch) | |
| tree | 81be8f5b52f6ad78d4d8e3ba64feeb5d420db691 | |
| parent | bc80da5bd34ac4047e0b91c0fe3ff96020d9bb25 (diff) | |
| download | emacs-3db0dc21689ae7dbdc697bb5fe45e988cee1f831.tar.gz emacs-3db0dc21689ae7dbdc697bb5fe45e988cee1f831.zip | |
Fix crash when closing fullscreen frame on macOS (bug#28661)
* src/nsterm.m (EmacsView::windowWillResize): Return new frame size
unmodified if the frame isn't live.
| -rw-r--r-- | src/nsterm.m | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/nsterm.m b/src/nsterm.m index f0b6a70dae3..abfdffc9f5e 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -6893,6 +6893,9 @@ not_in_argv (NSString *arg) | |||
| 6893 | NSTRACE_RECT ("[sender frame]", [sender frame]); | 6893 | NSTRACE_RECT ("[sender frame]", [sender frame]); |
| 6894 | NSTRACE_FSTYPE ("fs_state", fs_state); | 6894 | NSTRACE_FSTYPE ("fs_state", fs_state); |
| 6895 | 6895 | ||
| 6896 | if (!FRAME_LIVE_P (emacsframe)) | ||
| 6897 | return frameSize; | ||
| 6898 | |||
| 6896 | if (fs_state == FULLSCREEN_MAXIMIZED | 6899 | if (fs_state == FULLSCREEN_MAXIMIZED |
| 6897 | && (maximized_width != (int)frameSize.width | 6900 | && (maximized_width != (int)frameSize.width |
| 6898 | || maximized_height != (int)frameSize.height)) | 6901 | || maximized_height != (int)frameSize.height)) |