1 files changed, 11 insertions, 1 deletions
diff --git a/src/core/GpgCoreInit.cpp b/src/core/GpgCoreInit.cpp
index 42991564..2952d6e4 100644
--- a/src/core/GpgCoreInit.cpp
+++ b/src/core/GpgCoreInit.cpp
@@ -45,7 +45,17 @@
 
 namespace GpgFrontend {
 
-void DestroyGpgFrontendCore() { SingletonStorageCollection::Destroy(); }
+void DestroyGpgFrontendCore() {
+  // kill all daemon if necessary
+  auto settings = GlobalSettingStation::GetInstance().GetSettings();
+  auto kill_all_gnupg_daemon_at_close =
+      settings.value("gnupg/kill_all_gnupg_daemon_at_close", false).toBool();
+  if (kill_all_gnupg_daemon_at_close) {
+    GpgAdvancedOperator::KillAllGpgComponents();
+  }
+
+  SingletonStorageCollection::Destroy();
+}
 
 auto VerifyGpgconfPath(const QFileInfo& gnupg_install_fs_path) -> bool {
   return gnupg_install_fs_path.isAbsolute() && gnupg_install_fs_path.exists() &&