jacobpascual/keepassxc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly block modified signal during Database destruction (#6438)

Browse Source 
fixes #6393
This commit is contained in:
Aetf
2021-05-27 21:50:15 -04:00
committed by GitHub
parent 66c3026cf5
commit 81a66c439c
34 changed files with 370 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/fdosecrets/objects/Collection.cpp
View File

@@ -475,7 +475,7 @@ namespace FdoSecrets
}
});
// Another possibility is the group being moved to recycle bin.
connect(m_exposedGroup.data(), &Group::groupModified, this, [this]() {
connect(m_exposedGroup.data(), &Group::modified, this, [this]() {
if (inRecycleBin(m_exposedGroup->parentGroup())) {
// reset the exposed group to none
FdoSecrets::settings()->setExposedGroup(m_backend->database().data(), {});
@@ -483,7 +483,7 @@ namespace FdoSecrets
});
// Monitor exposed group settings
connect(m_backend->database()->metadata()->customData(), &CustomData::customDataModified, this, [this]() {
connect(m_backend->database()->metadata()->customData(), &CustomData::modified, this, [this]() {
if (!m_exposedGroup || backendLocked()) {
return;
}
@@ -500,8 +500,8 @@ namespace FdoSecrets
onEntryAdded(entry, false);
}
// Do not connect to databaseModified signal because we only want signals for the subset under m_exposedGroup
connect(m_backend->database()->metadata(), &Metadata::metadataModified, this, &Collection::collectionChanged);
// Do not connect to Database::modified signal because we only want signals for the subset under m_exposedGroup
connect(m_backend->database()->metadata(), &Metadata::modified, this, &Collection::collectionChanged);
connectGroupSignalRecursive(m_exposedGroup);
}
@@ -556,7 +556,7 @@ namespace FdoSecrets
return;
}
connect(group, &Group::groupModified, this, &Collection::collectionChanged);
connect(group, &Group::modified, this, &Collection::collectionChanged);
connect(group, &Group::entryAdded, this, [this](Entry* entry) { onEntryAdded(entry, true); });
const auto children = group->children();