1 files changed, 5 insertions, 4 deletions
diff --git a/src/ui/dialog/key_generate/KeygenDialog.cpp b/src/ui/dialog/key_generate/KeygenDialog.cpp
index 33d7c2f9..f7afeef9 100644
--- a/src/ui/dialog/key_generate/KeygenDialog.cpp
+++ b/src/ui/dialog/key_generate/KeygenDialog.cpp
@@ -166,7 +166,7 @@ void KeyGenDialog::slot_key_gen_accept() {
       ResetTempCacheValue("__key_passphrase");
     }
 
-    SPDLOG_DEBUG("generate done");
+    SPDLOG_DEBUG("key generation done");
 
     if (gpgme_err_code(error) == GPG_ERR_NO_ERROR) {
       auto* msg_box = new QMessageBox(qobject_cast<QWidget*>(this->parent()));
@@ -177,14 +177,15 @@ void KeyGenDialog::slot_key_gen_accept() {
       msg_box->setModal(true);
       msg_box->open();
 
-      SPDLOG_DEBUG("generate success");
+      SPDLOG_DEBUG("key generate successful");
 
       emit SignalKeyGenerated();
-      this->close();
     } else {
       QMessageBox::critical(this, _("Failure"), _("Key generation failed."));
     }
 
+    this->done(0);
+
   } else {
     /**
      * create error message
@@ -200,7 +201,7 @@ void KeyGenDialog::slot_key_gen_accept() {
 }
 
 void KeyGenDialog::slot_expire_box_changed() {
-  if (expire_check_box_->checkState()) {
+  if (expire_check_box_->checkState() != 0U) {
     date_edit_->setEnabled(false);
   } else {
     date_edit_->setEnabled(true);