1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QFileDialog: disconnect nativeEnterDirectory in dtor

Browse Source 
QIOSFileDialog emits directoryEntered from its hide/setVisible
after QFileDialog is a QDialog already (in the process of destruction).
This results in an ssert: "ASSERT failure in QFileDialog: "Called object is
not of the correct type (class destructor may have already run)"",

Fixes: QTBUG-130133
Change-Id: I8471a8434f7ea854a91b989bb3a6f3b962143ea8
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
(cherry picked from commit 2083daf79bc53a65a821e1cd3463638ac0c65f2e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Timur Pocheptsov 2024-10-17 16:47:06 +02:00 committed by Qt Cherry-pick Bot
parent 993fa70777
commit dc885e39c9
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/widgets/dialogs/qfiledialog.cpp
View File

@ -373,10 +373,16 @@ QFileDialog::QFileDialog(const QFileDialogArgs &args)
*/
QFileDialog::~QFileDialog()
{
#if QT_CONFIG(settings)
Q_D(QFileDialog);
#if QT_CONFIG(settings)
d->saveSettings();
#endif
if (QPlatformFileDialogHelper *platformHelper = d->platformFileDialogHelper()) {
// QIOSFileDialog emits directoryChanged while hiding, causing an assert
// because of a partially destroyed QFileDialog.
QObjectPrivate::disconnect(platformHelper, &QPlatformFileDialogHelper::directoryEntered,
d, &QFileDialogPrivate::nativeEnterDirectory);
}
}
/*!