mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-05 13:37:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release/2.6.2' into develop

Browse source
This commit is contained in:
Jonathan White 2020-10-07 11:27:14 -04:00
commit fb87b1c794
No known key found for this signature in database
GPG key ID: 440FC65F2E0C6E01
6 changed files with 48 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/browser/BrowserService.cpp
View file

@ -1177,6 +1177,10 @@ bool BrowserService::checkLegacySettings(QSharedPointer<Database> db)
bool legacySettingsFound = false;
QList<Entry*> 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;