From fd8d81f517b5e33a046eeafa5e76f06f24b6abbc Mon Sep 17 00:00:00 2001 From: varjolintu Date: Sun, 27 Sep 2020 20:41:41 +0300 Subject: [PATCH] Ignore recycle bin on KeePassHTTP migration --- src/browser/BrowserService.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp index 08c9f88da5..9cb2e27292 100644 --- a/src/browser/BrowserService.cpp +++ b/src/browser/BrowserService.cpp @@ -1166,6 +1166,10 @@ bool BrowserService::checkLegacySettings(QSharedPointer db) bool legacySettingsFound = false; QList entries = db->rootGroup()->entriesRecursive(); for (const auto& e : entries) { + if (e->isRecycled()) { + continue; + } + if ((e->attributes()->contains(KEEPASSHTTP_NAME) || e->attributes()->contains(KEEPASSXCBROWSER_NAME)) || (e->title() == KEEPASSHTTP_NAME || e->title().contains(KEEPASSXCBROWSER_NAME, Qt::CaseInsensitive))) { legacySettingsFound = true;