fix: slove discovered bugs

1 files changed, 20 insertions, 19 deletions

diff --git a/src/ui/dialog/import_export/KeyImportDetailDialog.cpp b/src/ui/dialog/import_export/KeyImportDetailDialog.cpp
index 720fa883..40a8ec80 100644
--- a/src/ui/dialog/import_export/KeyImportDetailDialog.cpp
+++ b/src/ui/dialog/import_export/KeyImportDetailDialog.cpp
@@ -37,34 +37,35 @@ KeyImportDetailDialog::KeyImportDetailDialog(
     std::shared_ptr<GpgImportInformation> result, QWidget* parent)
     : GeneralDialog(typeid(KeyImportDetailDialog).name(), parent),
       m_result_(std::move(result)) {
+  this->setAttribute(Qt::WA_DeleteOnClose);
+
   // If no key for import found, just show a message
-  if (m_result_->considered == 0) {
+  if (m_result_ == nullptr || m_result_->considered == 0) {
     QMessageBox::information(parent, tr("Key Import Details"),
                              tr("No keys found to import"));
-    emit finished(0);
+
     this->close();
-    this->deleteLater();
-  } else {
-    auto* mv_box = new QVBoxLayout();
+    return;
+  }
 
-    this->create_general_info_box();
-    mv_box->addWidget(general_info_box_);
-    this->create_keys_table();
-    mv_box->addWidget(keys_table_);
-    this->create_button_box();
-    mv_box->addWidget(button_box_);
+  auto* mv_box = new QVBoxLayout();
 
-    this->setLayout(mv_box);
-    this->setWindowTitle(tr("Key Import Details"));
+  this->create_general_info_box();
+  mv_box->addWidget(general_info_box_);
+  this->create_keys_table();
+  mv_box->addWidget(keys_table_);
+  this->create_button_box();
+  mv_box->addWidget(button_box_);
 
-    this->setMinimumSize(QSize(600, 300));
-    this->adjustSize();
+  this->setLayout(mv_box);
+  this->setWindowTitle(tr("Key Import Details"));
 
-    movePosition2CenterOfParent();
+  this->setMinimumSize(QSize(600, 300));
+  this->adjustSize();
 
-    this->setModal(true);
-    this->show();
-  }
+  movePosition2CenterOfParent();
+  this->setModal(true);
+  this->show();
 }
 
 void KeyImportDetailDialog::create_general_info_box() {