From 2bb89cb8c0255b2e852a8da516df6f0dc9f250fd Mon Sep 17 00:00:00 2001 From: Christian Hohnstaedt Date: Sun, 29 Sep 2024 12:47:15 +0200 Subject: [PATCH] Disable Import button when creating a new template It does not belong there and caused a crash when pressing import and then OK. --- widgets/NewX509.cpp | 5 +++-- widgets/NewX509.h | 2 +- widgets/TempTreeView.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/widgets/NewX509.cpp b/widgets/NewX509.cpp index c0665f4a..964b0fc5 100644 --- a/widgets/NewX509.cpp +++ b/widgets/NewX509.cpp @@ -370,7 +370,7 @@ void NewX509::setReqAttributes(pki_x509req *req) } /* Initialize dialog for Template creation */ -void NewX509::setTemp(pki_temp *temp) +void NewX509::setTemp(pki_temp *temp, bool create) { description->setText(temp->getIntName()); capt->setText(tr("Edit XCA template")); @@ -381,7 +381,8 @@ void NewX509::setTemp(pki_temp *temp) pt = tmpl; fromTemplate(temp); comment->setPlainText(temp->getComment()); - connect_pki(temp); + if (!create) + connect_pki(temp); } /* Initialize dialog for Certificate creation */ diff --git a/widgets/NewX509.h b/widgets/NewX509.h index f1b36b61..656e7c34 100644 --- a/widgets/NewX509.h +++ b/widgets/NewX509.h @@ -77,7 +77,7 @@ class NewX509: public XcaDetail, public Ui::NewX509 virtual ~NewX509(); void initCtx(); void setRequest(); // reduce to request form - void setTemp(pki_temp *temp); // reduce to template form + void setTemp(pki_temp *temp, bool create = false); // reduce to template form void setCert(); // reduce to certificate form void toTemplate(pki_temp *temp); void fromTemplate(pki_temp *temp); diff --git a/widgets/TempTreeView.cpp b/widgets/TempTreeView.cpp index 926aa933..f0b8037d 100644 --- a/widgets/TempTreeView.cpp +++ b/widgets/TempTreeView.cpp @@ -62,7 +62,7 @@ bool TempTreeView::runTempDlg(pki_temp *temp) { NewX509 *dlg = new NewX509(this); - dlg->setTemp(temp); + dlg->setTemp(temp, true); if (!dlg->exec()) { delete dlg; return false;