feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core: Wrap moribund dialogs into QPointer

Browse Source 
There's no guarantee that items in the collected list don't die for
other reasons before it's their turn in the loop.

Change-Id: I5e81a25c3c205646eece30d6dd1a95f4b97eda05
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2024-03-04 14:50:27 +01:00
parent 50c4046593
commit 6d6ec00cdb
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/coreplugin/icore.cpp
View File

@@ -2189,15 +2189,17 @@ void ICorePrivate::openFileFromDevice()
static void acceptModalDialogs() static void acceptModalDialogs()
{ {
const QWidgetList topLevels = QApplication::topLevelWidgets(); const QWidgetList topLevels = QApplication::topLevelWidgets();
QList<QDialog *> dialogsToClose; QList<QPointer<QDialog>> dialogsToClose;
for (QWidget *topLevel : topLevels) { for (QWidget *topLevel : topLevels) {
if (auto dialog = qobject_cast<QDialog *>(topLevel)) { if (auto dialog = qobject_cast<QDialog *>(topLevel)) {
if (dialog->isModal()) if (dialog->isModal())
dialogsToClose.append(dialog); dialogsToClose.append(dialog);
} }
} }
for (QDialog *dialog : dialogsToClose) for (QDialog *dialog : dialogsToClose) {
if (dialog)
dialog->accept(); dialog->accept();
}
} }
} // Internal } // Internal