Skip to content
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.

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

[stable-3.10] Fix crash when clicking on import legacy account dialog 'Skip' button. #6208

Merged
merged 1 commit into from
Nov 7, 2023
Merged
Changes from all commits
Commits
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
Fix crash when clicking on import legacy account dialog 'Skip' button.
- mac OS only: With Qt::WA_DeleteOnClose the dialog was being deleted twice.

Signed-off-by: Camila <hello@camila.codes>
  • Loading branch information
Camila authored and backportbot-nextcloud[bot] committed Nov 7, 2023
commit 51c9434e9a984292d2d6c66f43da4e9d73ff5bcf
1 change: 0 additions & 1 deletion src/gui/accountmanager.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*

Check notice on line 1 in src/gui/accountmanager.cpp

GitHub Actions / build

Run clang-format on src/gui/accountmanager.cpp

File src/gui/accountmanager.cpp (lines 17, 27, 33, 64, 67, 84, 109, 151, 165, 194, 195, 196, 197, 259, 266, 267, 364, 521, 523, 540, 568, 569): Code does not conform to Custom style guidelines.
* Copyright (C) by Olivier Goffart <ogoffart@woboq.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -199,7 +199,6 @@
const auto importMessageBox = new QMessageBox(QMessageBox::Question, tr("Legacy import"), importQuestion);
importMessageBox->addButton(tr("Import"), QMessageBox::AcceptRole);
const auto skipButton = importMessageBox->addButton(tr("Skip"), QMessageBox::DestructiveRole);
importMessageBox->setAttribute(Qt::WA_DeleteOnClose);
importMessageBox->exec();
if (importMessageBox->clickedButton() == skipButton) {
return false;
Loading