Skip to content

Fix sshAgent casacading calls with QSignalBlocker #13068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AlexpFr wants to merge 1 commit into
base: develop
Choose a base branch
from
+10 −0
Open

Fix sshAgent casacading calls with QSignalBlocker #13068

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/gui/entry/EditEntryWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#include "core/PasswordGenerator.h"
#include "core/TimeDelta.h"
#ifdef WITH_XC_SSHAGENT
#include <QSignalBlocker>
#include "sshagent/OpenSSHKey.h"
#include "sshagent/OpenSSHKeyGenDialog.h"
#include "sshagent/SSHAgent.h"
Expand Down Expand Up @@ -636,6 +637,7 @@ void EditEntryWidget::setSSHAgentSettings()
m_sshAgentUi->requireUserConfirmationCheckBox->setChecked(m_sshAgentSettings.useConfirmConstraintWhenAdding());
m_sshAgentUi->lifetimeCheckBox->setChecked(m_sshAgentSettings.useLifetimeConstraintWhenAdding());
m_sshAgentUi->lifetimeSpinBox->setValue(m_sshAgentSettings.lifetimeConstraintDuration());
QSignalBlocker sshAgent_attachmentComboBox_Blocker(m_sshAgentUi->attachmentComboBox);
m_sshAgentUi->attachmentComboBox->clear();
m_sshAgentUi->addToAgentButton->setEnabled(false);
m_sshAgentUi->removeFromAgentButton->setEnabled(false);
Expand Down Expand Up @@ -672,6 +674,7 @@ void EditEntryWidget::updateSSHAgentAttachments()
setSSHAgentSettings();
}

QSignalBlocker sshAgent_attachmentComboBox_Blocker(m_sshAgentUi->attachmentComboBox);
m_sshAgentUi->attachmentComboBox->clear();
m_sshAgentUi->attachmentComboBox->addItem("");

Expand All @@ -684,6 +687,7 @@ void EditEntryWidget::updateSSHAgentAttachments()
}

m_sshAgentUi->attachmentComboBox->setCurrentText(m_sshAgentSettings.attachmentName());
QSignalBlocker sshAgent_externalFileEdit_Blocker(m_sshAgentUi->externalFileEdit);
m_sshAgentUi->externalFileEdit->setText(m_sshAgentSettings.fileName());

if (m_sshAgentSettings.selectedType() == "attachment") {
Expand Down Expand Up @@ -966,6 +970,9 @@ void EditEntryWidget::loadEntry(Entry* entry,

void EditEntryWidget::setForms(Entry* entry, bool restore)
{
#ifdef WITH_XC_SSHAGENT
QSignalBlocker attachmentsBlocker(m_attachments.data());
#endif
m_attachments->copyDataFrom(entry->attachments());
m_customData->copyDataFrom(entry->customData());

Expand Down Expand Up @@ -1382,6 +1389,9 @@ void EditEntryWidget::clear()
m_mainUi->notesEdit->clear();

m_entryAttributes->clear();
#ifdef WITH_XC_SSHAGENT
QSignalBlocker attachmentsBlocker(m_attachments.data());
#endif
m_attachments->clear();
m_customData->clear();
m_autoTypeAssoc->clear();
Expand Down
Loading