Close sheet before removing from parent.

* Source/NSAlert.m (NSBeginAlertSheet): Move closing the sheet from
here...
* Source/NSApplication.m (-beginSheet:...:contextInfo:): ...to here.
This commit is contained in:
fredkiefer 2018-02-04 21:18:43 +01:00
parent b17b443266
commit 712e7a4e15
3 changed files with 7 additions and 9 deletions

View file

@ -1,3 +1,9 @@
2018-02-04 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSAlert.m (NSBeginAlertSheet): Move closing the sheet from
here...
* Source/NSApplication.m (-beginSheet:...:contextInfo:): ...to here.
2018-01-29 Fred Kiefer <FredKiefer@gmx.de>
* Tools/speech/GNUmakefile,

View file

@ -1679,15 +1679,6 @@ void NSBeginAlertSheet(NSString *title,
didEndSelector: willEndSelector
contextInfo: contextInfo];
[panel close];
if (modalDelegate && [modalDelegate respondsToSelector: didEndSelector])
{
void (*didEnd)(id, SEL, id, NSInteger, void*);
didEnd = (void (*)(id, SEL, id, NSInteger, void*))[modalDelegate
methodForSelector: didEndSelector];
didEnd(modalDelegate, didEndSelector, panel, [panel result], contextInfo);
}
NSReleaseAlertPanel(panel);
}

View file

@ -2032,6 +2032,7 @@ See -runModalForWindow:
didEnd(modalDelegate, didEndSelector, sheet, ret, contextInfo);
}
[sheet close];
[docWindow setAttachedSheet: nil];
[sheet setParentWindow: nil];
[[NSNotificationCenter defaultCenter]