Merge pull request #3346 from nextcloud/bugfix/e2ee-warning-vfs-dialog

Set button on QMessageBox before changing the text
nextcloud · May 27, 2021 · a807263 · a807263
2 parents ba5f517 + 03610cb
commit a807263
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
@@ -88,10 +88,14 @@ bool showEnableE2eeWithVirtualFilesWarningDialog()
                                                                              " End-to-End Encryption, make sure the encrypted folder is marked with"
                                                                              " \"Make always available locally\"."));
     e2eeWithVirtualFilesWarningMsgBox.setIcon(QMessageBox::Warning);
-    const auto dontEncryptButton = e2eeWithVirtualFilesWarningMsgBox.button(QMessageBox::StandardButton::Ok);
-    const auto encryptButton = e2eeWithVirtualFilesWarningMsgBox.button(QMessageBox::StandardButton::Cancel);
+    const auto dontEncryptButton = e2eeWithVirtualFilesWarningMsgBox.addButton(QMessageBox::StandardButton::Ok);
+    Q_ASSERT(dontEncryptButton);
     dontEncryptButton->setText(AccountSettings::tr("Don't encrypt folder"));
+    const auto encryptButton = e2eeWithVirtualFilesWarningMsgBox.addButton(QMessageBox::StandardButton::Cancel);
+    Q_ASSERT(encryptButton);
     encryptButton->setText(AccountSettings::tr("Encrypt folder"));
+    e2eeWithVirtualFilesWarningMsgBox.exec();
+
 
     return e2eeWithVirtualFilesWarningMsgBox.clickedButton() != dontEncryptButton;
 }