Merge pull request #130 from saturneric/dev/2.1.1/main

Develop 2.1.2.5
saturneric · Feb 1, 2024 · 264eff9 · 264eff9
2 parents d5e6fdb + 55afb9f
commit 264eff9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/core/GpgCoreInit.cpp b/src/core/GpgCoreInit.cpp
@@ -319,7 +319,7 @@ void InitGpgFrontendCore(CoreInitArgs args) {
                 .toString();
 
         auto use_pinentry_as_password_input_dialog =
-            settings.value("gnupg/use_pinentry_as_password_input_dialog", false)
+            settings.value("gnupg/use_pinentry_as_password_input_dialog", true)
                 .toBool();
 
         GF_CORE_LOG_DEBUG("core loaded if use custom key databse path: {}",

diff --git a/src/ui/dialog/gnupg/GnuPGControllerDialog.cpp b/src/ui/dialog/gnupg/GnuPGControllerDialog.cpp
@@ -296,7 +296,7 @@ void GnuPGControllerDialog::set_settings() {
   }
 
   bool const use_pinentry_as_password_input_dialog =
-      settings.value("gnupg/use_pinentry_as_password_input_dialog", false)
+      settings.value("gnupg/use_pinentry_as_password_input_dialog", true)
           .toBool();
   if (use_pinentry_as_password_input_dialog) {
     ui_->usePinentryAsPasswordInputDialogCheckBox->setCheckState(Qt::Checked);

diff --git a/src/ui/dialog/key_generate/KeygenDialog.cpp b/src/ui/dialog/key_generate/KeygenDialog.cpp
@@ -141,7 +141,7 @@ void KeyGenDialog::slot_key_gen_accept() {
 
     if (!GlobalSettingStation::GetInstance()
              .GetSettings()
-             .value("gnupg/use_pinentry_as_password_input_dialog", false)
+             .value("gnupg/use_pinentry_as_password_input_dialog", true)
              .toBool() &&
         !no_pass_phrase_check_box_->isChecked()) {
       SetCacheValue("PinentryContext", "NEW_PASSPHRASE");