4 files changed, 8 insertions, 16 deletions
diff --git a/src/ui/help/AboutDialog.cpp b/src/ui/help/AboutDialog.cpp
index 310cbddb..7358ced5 100644
--- a/src/ui/help/AboutDialog.cpp
+++ b/src/ui/help/AboutDialog.cpp
@@ -53,7 +53,7 @@ AboutDialog::AboutDialog(int defaultIndex, QWidget* parent) : QDialog(parent) {
 
   auto* buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok);
   connect(buttonBox, SIGNAL(accepted()), this, SLOT(close()));
-
+  
   auto* mainLayout = new QVBoxLayout;
   mainLayout->addWidget(tabWidget);
   mainLayout->addWidget(buttonBox);
diff --git a/src/ui/keypair_details/KeyPairUIDTab.cpp b/src/ui/keypair_details/KeyPairUIDTab.cpp
index 0ca7eb2c..3d56699a 100644
--- a/src/ui/keypair_details/KeyPairUIDTab.cpp
+++ b/src/ui/keypair_details/KeyPairUIDTab.cpp
@@ -329,22 +329,17 @@ void KeyPairUIDTab::slotDelUID() {
           "</b><br/><br/>" + keynames + +"<br/>" +
           _("The action can not be undone."),
       QMessageBox::No | QMessageBox::Yes);
-
-  bool if_all_success = true;
-
+  
   if (ret == QMessageBox::Yes) {
     for (const auto& uid : *selected_uids) {
       LOG(INFO) << "KeyPairUIDTab::slotDelUID UID" << uid;
       if (!UidOperator::GetInstance().revUID(mKey, uid)) {
-        if_all_success = false;
+        QMessageBox::critical(
+            nullptr, _("Operation Failed"),
+            QString(_("An error occurred during the delete %1 operation."))
+                .arg(uid.c_str()));
       }
     }
-
-    if (!if_all_success) {
-      QMessageBox::critical(
-          nullptr, _("Operation Failed"),
-          _("At least an error occurred during the operation."));
-    }
     emit signalUpdateUIDInfo();
   }
 }
diff --git a/src/ui/main_window/MainWindowFileSlotFunction.cpp b/src/ui/main_window/MainWindowFileSlotFunction.cpp
index 0b4f7837..25445dcc 100644
--- a/src/ui/main_window/MainWindowFileSlotFunction.cpp
+++ b/src/ui/main_window/MainWindowFileSlotFunction.cpp
@@ -463,19 +463,16 @@ void MainWindow::slotFileEncryptCustom() {
 }
 
 void MainWindow::slotFileDecryptCustom() {
-  auto key_ids = mKeyList->getChecked();
   new FileEncryptionDialog(mKeyList->getChecked(),
                            FileEncryptionDialog::Decrypt, this);
 }
 
 void MainWindow::slotFileSignCustom() {
-  auto key_ids = mKeyList->getChecked();
   new FileEncryptionDialog(mKeyList->getChecked(), FileEncryptionDialog::Sign,
                            this);
 }
 
 void MainWindow::slotFileVerifyCustom() {
-  auto key_ids = mKeyList->getChecked();
   new FileEncryptionDialog(mKeyList->getChecked(), FileEncryptionDialog::Verify,
                            this);
 }
diff --git a/src/ui/settings/SettingsGeneral.cpp b/src/ui/settings/SettingsGeneral.cpp
index e6ee5499..98610e12 100644
--- a/src/ui/settings/SettingsGeneral.cpp
+++ b/src/ui/settings/SettingsGeneral.cpp
@@ -280,9 +280,9 @@ void GeneralTab::applySettings() {
         lang.key(langSelectBox->currentText()).toStdString();
   else {
     general["lang"] = lang.key(langSelectBox->currentText()).toStdString();
-#endif
   }
-
+#endif
+  
 #ifdef SERVER_SUPPORT
   settings.setValue(
       "general/ownKeyId",