From 72d17c045f56b872144438f5fde928e7ee59c607 Mon Sep 17 00:00:00 2001
From: Felix Geyer <debfx@fobos.de>
Date: Fri, 22 Mar 2013 20:53:10 +0100
Subject: [PATCH] Handle deleting groups more consistently.

Delete the entries and child groups in Group dtor
no what if the group has a database or not.
---
 src/core/Group.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/core/Group.cpp b/src/core/Group.cpp
index f6e391859..763c5c0f9 100644
--- a/src/core/Group.cpp
+++ b/src/core/Group.cpp
@@ -40,19 +40,19 @@ Group::~Group()
     this->blockSignals(true);
     // Destroy entries and children manually so DeletedObjects can be added
     // to database.
+    QList<Entry*> entries = m_entries;
+    Q_FOREACH (Entry* entry, entries) {
+        entry->blockSignals(true);
+        delete entry;
+    }
+
+    QList<Group*> children = m_children;
+    Q_FOREACH (Group* group, children) {
+        group->blockSignals(true);
+        delete group;
+    }
+
     if (m_db && m_parent) {
-        QList<Entry*> entries = m_entries;
-        Q_FOREACH (Entry* entry, entries) {
-            entry->blockSignals(true);
-            delete entry;
-        }
-
-        QList<Group*> children = m_children;
-        Q_FOREACH (Group* group, children) {
-            group->blockSignals(true);
-            delete group;
-        }
-
         DeletedObject delGroup;
         delGroup.deletionTime = Tools::currentDateTimeUtc();
         delGroup.uuid = m_uuid;