diff options
| author | Julian Eisel <julian@blender.org> | 2020-05-07 13:32:49 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-05-07 14:55:14 +0300 |
| commit | 45adcc51b21d626238b25428f791937148cf0a20 (patch) | |
| tree | ff1670722d40f6077d9b440c533027432dc4c23a /intern/ghost | |
| parent | b9491476e5c11b789b8ecaad87a2b2de4c09a60a (diff) | |
macOS: Remove workaround for old quit dialog
Got added in 1a30e52142c5 (and tweaked in follow-ups) but shouldn't be needed
anymore with the newer popup based quit dialog.
It prevents Blender from quitting properly in case macOS closed all Blender
windows. This may happen in some corner-cases unfortunately (e.g. T74101) which
would be nice to have addressed at some point. Until then, users shouldn't have
to force-kill Blender to shut it down if they run into this.
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemCocoa.mm | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index 2b6a2902757..5592078e20e 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -1063,14 +1063,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleWindowEvent(GHOST_TEventType eventType, } switch (eventType) { case GHOST_kEventWindowClose: - // check for index of mainwindow as it would quit blender without dialog and discard - if ([windowsList count] > 1 && - window->getCocoaWindow() != [windowsList objectAtIndex:[windowsList count] - 1]) { - pushEvent(new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowClose, window)); - } - else { - handleQuitRequest(); // -> quit dialog - } + pushEvent(new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowClose, window)); break; case GHOST_kEventWindowActivate: m_windowManager->setActiveWindow(window); |