1 files changed, 9 insertions, 0 deletions
diff --git a/src/gui/dialogs/qfontdialog_mac.mm b/src/gui/dialogs/qfontdialog_mac.mm
index 9c63dfa..e2c0ef5 100644
--- a/src/gui/dialogs/qfontdialog_mac.mm
+++ b/src/gui/dialogs/qfontdialog_mac.mm
@@ -116,6 +116,7 @@ const int StyleMask = NSTitledWindowMask | NSClosableWindowMask | NSResizableWin
 - (void)showModelessPanel;
 - (void)showWindowModalSheet:(QWidget *)docWidget;
 - (void)runApplicationModalPanel;
+- (BOOL)isAppModal;
 - (void)changeFont:(id)sender;
 - (void)changeAttributes:(id)sender;
 - (BOOL)windowShouldClose:(id)window;
@@ -226,6 +227,7 @@ static QFont qfontForCocoaFont(NSFont *cocoaFont, const QFont &resolveFont)
     QBoolBlocker nativeDialogOnTop(QApplicationPrivate::native_modal_dialog_active);
     mAppModal = true;
     NSWindow *ourPanel = [mStolenContentView window];
+    [ourPanel setReleasedWhenClosed:NO];
     [NSApp runModalForWindow:ourPanel];
     QAbstractEventDispatcher::instance()->interrupt();
 
@@ -235,6 +237,11 @@ static QFont qfontForCocoaFont(NSFont *cocoaFont, const QFont &resolveFont)
         mPriv->fontDialog()->reject();
 }
 
+- (BOOL)isAppModal
+{
+    return mAppModal;
+}
+
 - (void)showWindowModalSheet:(QWidget *)docWidget
 {
 #ifdef QT_MAC_USE_COCOA
@@ -485,6 +492,8 @@ void QFontDialogPrivate::closeCocoaFontPanel()
     QT_MANGLE_NAMESPACE(QCocoaFontPanelDelegate) *theDelegate = static_cast<QT_MANGLE_NAMESPACE(QCocoaFontPanelDelegate) *>(delegate);
     NSWindow *ourPanel = [theDelegate actualPanel];
     [ourPanel close];
+    if ([theDelegate isAppModal])
+        [ourPanel release];
     [theDelegate cleanUpAfterMyself];
     [theDelegate release];
     this->delegate = 0;