From 6a0a78b870b13cc180cf88674f78df761618bdb8 Mon Sep 17 00:00:00 2001 From: vuurvlieg Date: Mon, 25 Mar 2024 14:46:29 +0100 Subject: [PATCH] Fix missed case of incorrect update to a Group's LastModificationTime --- src/core/Entry.cpp | 3 +-- src/core/Group.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/core/Entry.cpp b/src/core/Entry.cpp index 8fee33587..cf1c504a0 100644 --- a/src/core/Entry.cpp +++ b/src/core/Entry.cpp @@ -1483,9 +1483,8 @@ QUuid Entry::previousParentGroupUuid() const void Entry::setPreviousParentGroupUuid(const QUuid& uuid) { - // prevent set from changing the LastModificationTime bool prevUpdateTimeinfo = m_updateTimeinfo; - m_updateTimeinfo = false; + m_updateTimeinfo = false; // prevent update of LastModificationTime set(m_data.previousParentGroupUuid, uuid); m_updateTimeinfo = prevUpdateTimeinfo; } diff --git a/src/core/Group.cpp b/src/core/Group.cpp index f6b7f03fe..d1df6e94c 100644 --- a/src/core/Group.cpp +++ b/src/core/Group.cpp @@ -494,7 +494,11 @@ void Group::setParent(Group* parent, int index, bool trackPrevious) m_data.timeInfo.setLocationChanged(Clock::currentDateTimeUtc()); } + bool prevUpdateTimeInfo = m_updateTimeinfo; + m_updateTimeinfo = false; // prevent update of LastModificationTime emitModified(); + m_updateTimeinfo = prevUpdateTimeInfo; + if (!moveWithinDatabase) { emit groupAdded(); @@ -1237,9 +1241,8 @@ QUuid Group::previousParentGroupUuid() const void Group::setPreviousParentGroupUuid(const QUuid& uuid) { - // prevent set from changing the LastModificationTime bool prevUpdateTimeinfo = m_updateTimeinfo; - m_updateTimeinfo = false; + m_updateTimeinfo = false; // prevent update of LastModificationTime set(m_data.previousParentGroupUuid, uuid); m_updateTimeinfo = prevUpdateTimeinfo; }