From e8ac70120b113b28cd42ac7a5e72663c912fbe64 Mon Sep 17 00:00:00 2001
From: Florian Geyer <blueice@fobos.de>
Date: Thu, 19 Apr 2012 00:46:37 +0200
Subject: [PATCH] Delete entries for good if already in recycle bin

---
 src/gui/DatabaseWidget.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index 7046eaad..28ed89bf 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -23,6 +23,7 @@
 #include <QtGui/QMessageBox>
 
 #include "core/Metadata.h"
+#include "core/Tools.h"
 #include "gui/ChangeMasterKeyWidget.h"
 #include "gui/EditEntryWidget.h"
 #include "gui/EditGroupWidget.h"
@@ -107,7 +108,8 @@ void DatabaseWidget::createEntry()
 
 void DatabaseWidget::deleteEntry()
 {
-    if (!m_db->metadata()->recycleBinEnabled()) {
+    bool inRecylceBin = Tools::hasChild(m_db->metadata()->recycleBin(), m_entryView->currentEntry());
+    if (inRecylceBin || !m_db->metadata()->recycleBinEnabled()) {
         QMessageBox::StandardButton result = QMessageBox::question(
             this, tr("Question"), tr("Do you really want to delete this entry for good?"),
             QMessageBox::Yes | QMessageBox::No);