From f9dc314e729678c22aaa3b23532e70bea8458ccf Mon Sep 17 00:00:00 2001 From: Florian Geyer Date: Sun, 10 Mar 2013 20:03:22 +0100 Subject: [PATCH] Revert "Show correct group name when opening an entry from seach results." Did not want to push this. This reverts commit 4daac65cc528c067c18f9dd6c5d390cd99777681. --- src/gui/DatabaseWidget.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp index d2ff0d33..aedad473 100644 --- a/src/gui/DatabaseWidget.cpp +++ b/src/gui/DatabaseWidget.cpp @@ -430,9 +430,14 @@ void DatabaseWidget::switchToEntryEdit(Entry* entry) void DatabaseWidget::switchToEntryEdit(Entry* entry, bool create) { - Q_ASSERT(entry->group()); + Group* group = m_groupView->currentGroup(); + if (!group) { + Q_ASSERT(m_entryView->inEntryListMode()); + group = m_lastGroup; + } + Q_ASSERT(group); - m_editEntryWidget->loadEntry(entry, create, false, entry->group()->name(), m_db); + m_editEntryWidget->loadEntry(entry, create, false, group->name(), m_db); setCurrentWidget(m_editEntryWidget); }