diff options
| author | Toni Spets <toni.spets@iki.fi> | 2021-11-24 21:20:04 +0300 |
|---|---|---|
| committer | Jonathan White <support@dmapps.us> | 2021-11-25 06:37:28 +0300 |
| commit | 2fb1c076d4e39dcaf1d3ca32f19d3ecdb39db862 (patch) | |
| tree | 9d3bb2899115cd6ca358ba3ee0b858ad9aae016b /src/gui | |
| parent | dc7ad6c1b7321b1d8ff3755b0bd8a6210f47bbc7 (diff) | |
SSH Agent: Show correct error messages in main window
Fixes #7152
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/DatabaseWidget.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp index 1183810b3..45702d7d7 100644 --- a/src/gui/DatabaseWidget.cpp +++ b/src/gui/DatabaseWidget.cpp @@ -666,11 +666,14 @@ void DatabaseWidget::addToAgent() return; } + SSHAgent* agent = SSHAgent::instance(); OpenSSHKey key; if (settings.toOpenSSHKey(currentEntry, key, true)) { - SSHAgent::instance()->addIdentity(key, settings, database()->uuid()); + if (!agent->addIdentity(key, settings, database()->uuid())) { + m_messageWidget->showMessage(agent->errorString(), MessageWidget::Error); + } } else { - m_messageWidget->showMessage(key.errorString(), MessageWidget::Error); + m_messageWidget->showMessage(settings.errorString(), MessageWidget::Error); } } @@ -687,11 +690,14 @@ void DatabaseWidget::removeFromAgent() return; } + SSHAgent* agent = SSHAgent::instance(); OpenSSHKey key; if (settings.toOpenSSHKey(currentEntry, key, false)) { - SSHAgent::instance()->removeIdentity(key); + if (!agent->removeIdentity(key)) { + m_messageWidget->showMessage(agent->errorString(), MessageWidget::Error); + } } else { - m_messageWidget->showMessage(key.errorString(), MessageWidget::Error); + m_messageWidget->showMessage(settings.errorString(), MessageWidget::Error); } } #endif |