From 5231d07fdf28045e7cf5aa5fffdb63c9ea8e9a83 Mon Sep 17 00:00:00 2001
From: Toni Spets <toni.spets@iki.fi>
Date: Sat, 20 Jan 2018 11:19:09 +0200
Subject: [PATCH] Ignore SSH keys in Recycle Bin, fixes #1396

---
 src/sshagent/SSHAgent.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/sshagent/SSHAgent.cpp b/src/sshagent/SSHAgent.cpp
index 7969fe0cc..2424bc97f 100644
--- a/src/sshagent/SSHAgent.cpp
+++ b/src/sshagent/SSHAgent.cpp
@@ -217,8 +217,14 @@ void SSHAgent::databaseModeChanged(DatabaseWidget::Mode mode)
     } else if (mode == DatabaseWidget::ViewMode && !m_keys.contains(uuid.toHex())) {
         for (Entry* e : widget->database()->rootGroup()->entriesRecursive()) {
 
-            if (!e->attachments()->hasKey("KeeAgent.settings"))
+            if (widget->database()->metadata()->recycleBinEnabled()
+                && e->group() == widget->database()->metadata()->recycleBin()) {
                 continue;
+            }
+
+            if (!e->attachments()->hasKey("KeeAgent.settings")) {
+                continue;
+            }
 
             KeeAgentSettings settings;
             settings.fromXml(e->attachments()->value("KeeAgent.settings"));