summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnne Jan Brouwer <brouwer@annejan.com>2023-08-20 22:42:25 +0200
committerGitHub <noreply@github.com>2023-08-20 22:42:25 +0200
commit1e5a217d6a14f06d699e2af52ef4ec4114bbdba2 (patch)
tree43d7ea5149102732ffc013491fb56ee94a68746b
parentf8e54ec3b92974664c3eccc1b271f558839a48e1 (diff)
parentab8cd93a7485ee364d5ada55ebd67e91869058c5 (diff)
Merge pull request #640 from lherschi/main
fix the unintended "running" of the entropy window in the keygen dial…
-rw-r--r--src/keygendialog.ui4
-rw-r--r--src/pass.cpp3
2 files changed, 5 insertions, 2 deletions
diff --git a/src/keygendialog.ui b/src/keygendialog.ui
index 61643bc8..f6ec8b13 100644
--- a/src/keygendialog.ui
+++ b/src/keygendialog.ui
@@ -240,8 +240,8 @@
# first test version please comment
#
%echo Generating a default key
-Key-Type: default
-Subkey-Type: default
+Key-Type: RSA
+Subkey-Type: RSA
Name-Real:
Name-Comment: QtPass
Name-Email:
diff --git a/src/pass.cpp b/src/pass.cpp
index f52c27a5..f01e71f1 100644
--- a/src/pass.cpp
+++ b/src/pass.cpp
@@ -229,6 +229,9 @@ void Pass::finished(int id, int exitCode, const QString &out,
case PASS_COPY:
emit finishedCopy(out, err);
break;
+ case GPG_GENKEYS:
+ emit finishedGenerateGPGKeys(out, err);
+ break;
default:
#ifdef QT_DEBUG
dbg() << "Unhandled process type" << pid;