Skip to content

fix: ddialog's lambda func may cause segfault #620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Nov 22, 2024
Merged

fix: ddialog's lambda func may cause segfault #620

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions src/widgets/ddialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ DDialogPrivate::DDialogPrivate(DDialog *qq)
, iconLayout(nullptr)
, contentLayout(nullptr)
, buttonLayout(nullptr)
, clickedButtonIndex(0)
, clickedButtonIndex(-1)
{

}
Expand Down Expand Up @@ -240,9 +240,9 @@ void DDialogPrivate::_q_onButtonClicked()
if (button) {
int index = buttonList.indexOf(button);
q->buttonClicked(index, button->text());
clickedButtonIndex = index;

if (onButtonClickedClose) {
clickedButtonIndex = index;
q->done(clickedButtonIndex);
}
}
Expand Down Expand Up @@ -1109,19 +1109,7 @@ int DDialog::exec()
D_D(DDialog);

d->clickedButtonIndex = -1;
int clickedIndex = d->clickedButtonIndex;

if (d->onButtonClickedClose) {
// 如果设置了WA_DeleteOnClose属性，那么在exec()中将直接delete this
// d->clickedButtonIndex中记录的数据失效，这里通过信号槽更新正确的数据
connect(this, &DDialog::buttonClicked, this, [ &clickedIndex ] (int index, const QString &) {
clickedIndex = index;
});
}

int code = DAbstractDialog::exec();

return clickedIndex >= 0 ? clickedIndex : code;
return DAbstractDialog::exec();
}

void DDialog::setCloseButtonVisible(bool closeButtonVisible)
Expand Down Expand Up @@ -1163,10 +1151,11 @@ void DDialog::hideEvent(QHideEvent *event)
void DDialog::closeEvent(QCloseEvent *event)
{
Q_UNUSED(event)
Q_D(DDialog);

Q_EMIT aboutToClose();

done(-1);
done(d->clickedButtonIndex);
Comment thread
rb-union marked this conversation as resolved.

Q_EMIT visibleChanged(isVisible());
Q_EMIT closed();
Expand Down