Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorJens Verwiebe <info@jensverwiebe.de>2013-10-02 23:54:24 +0400
committerJens Verwiebe <info@jensverwiebe.de>2013-10-02 23:54:24 +0400
commitbe20171f39fc5c9664e988c72cb3671d95b7fb8a (patch)
treea0d6712a69827090001247a0c2df7681eab25b91 /intern
parente308c2f166c1d59b52fdf4226d1fdbb3f669c678 (diff)
OSX/GHOST: fix own issue in 60510, should now (hopefully) cover all multiple window combinations
Diffstat (limited to 'intern')
-rw-r--r--intern/ghost/intern/GHOST_SystemCocoa.mm4
1 files changed, 1 insertions, 3 deletions
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm
index 770cfca6968..fcf39523917 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -1025,10 +1025,8 @@ GHOST_TSuccess GHOST_SystemCocoa::handleWindowEvent(GHOST_TEventType eventType,
}
switch (eventType) {
case GHOST_kEventWindowClose:
- // make window that should be closed frontmost
- [window->getCocoaWindow() makeKeyAndOrderFront:nil];
// check for index of mainwindow as it would quit blender without dialog and discard
- if (window->getCocoaWindow() != [windowsList objectAtIndex:([windowsList count] - 1)]) {
+ if ([windowsList count] > 1 && window->getCocoaWindow() != [windowsList objectAtIndex:[windowsList count] - 1]) {
pushEvent( new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowClose, window) );
}
else {