From 87bf4053310a949c98abb1312d34cea8f0ea0db2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 11 Jan 2021 17:19:14 +0100 Subject: [PATCH] macOS: Don't try to close already-closed/closing file dialog Doing so results in a warning about "modalSession has been exited prematurely - check for a reentrant call to endModalSession:", and on Big Sur will also result in the file failing to save because the return code from runModal will no longer be NSModalResponseOK. This would happen when the completion handler for beginSheetModalForWindow would call QNSOpenSavePanelDelegate_panelClosed, resulting in calls to QDialog::done(), which in turn tries to hide the dialog, via QCocoaFileDialogHelper::hideCocoaFilePanel(). Fixes: QTBUG-89959 Change-Id: I048afe3dcc7fe62e0d0273f12b4b2c0237abb052 Reviewed-by: Timur Pocheptsov (cherry picked from commit 163d9c7cc46aa9174fdaaac8d64d8050f05c0a1f) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm index bdf185d2752..1344ed75d99 100644 --- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm +++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm @@ -74,6 +74,8 @@ QT_USE_NAMESPACE typedef QSharedPointer SharedPointerFileDialogOptions; +static const int kReturnCodeNotSet = -1; + @implementation QNSOpenSavePanelDelegate { @public NSOpenPanel *mOpenPanel; @@ -110,7 +112,7 @@ typedef QSharedPointer SharedPointerFileDialogOptions; if ([mSavePanel respondsToSelector:@selector(setLevel:)]) [mSavePanel setLevel:NSModalPanelWindowLevel]; - mReturnCode = -1; + mReturnCode = kReturnCodeNotSet; mHelper = helper; mNameFilterDropDownList = new QStringList(mOptions->nameFilters()); QString selectedVisualNameFilter = mOptions->initiallySelectedNameFilter(); @@ -177,6 +179,10 @@ static QString strippedText(QString s) - (void)closePanel { + // An already closed/closing panel has its return code set + if (mReturnCode != kReturnCodeNotSet) + return; + *mCurrentSelection = QString::fromNSString([[mSavePanel URL] path]).normalized(QString::NormalizationForm_C); if ([mSavePanel respondsToSelector:@selector(close)]) [mSavePanel close];