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

Fix group signals (#2670)

Browse Source 
* Fix group not emitting signals when modified through copyDataFrom
* Fix Group::GroupData equals wrongly compares timeInfo
This commit is contained in:
Aetf
2019-02-01 17:03:28 -05:00
committed by Jonathan White
parent 42cfe01ad2
commit e60f4278f7
3 changed files with 49 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/Group.cpp
View File

@@ -865,7 +865,9 @@ Group* Group::clone(Entry::CloneFlags entryFlags, Group::CloneFlags groupFlags)
void Group::copyDataFrom(const Group* other)
{
m_data = other->m_data;
if (set(m_data, other->m_data)) {
emit groupDataChanged(this);
}
m_customData->copyDataFrom(other->m_customData);
m_lastTopVisibleEntry = other->m_lastTopVisibleEntry;
}
@@ -1079,7 +1081,7 @@ bool Group::GroupData::equals(const Group::GroupData& other, CompareItemOptions
if (::compare(customIcon, other.customIcon) != 0) {
return false;
}
if (timeInfo.equals(other.timeInfo, options) != 0) {
if (!timeInfo.equals(other.timeInfo, options)) {
return false;
}
// TODO HNH: Some properties are configurable - should they be ignored?