From 28e2806e077a2871dbb4f7e960febfc3653b6719 Mon Sep 17 00:00:00 2001 From: Jonathan White Date: Sun, 5 Mar 2023 22:14:06 -0500 Subject: [PATCH] Make open folder icon exempt from "Apply group icon to entry" * Fix #9201 --- src/core/Group.cpp | 4 +++- src/core/Group.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/core/Group.cpp b/src/core/Group.cpp index d0c87b3e2..bb2094e6c 100644 --- a/src/core/Group.cpp +++ b/src/core/Group.cpp @@ -33,6 +33,7 @@ #include const int Group::DefaultIconNumber = 48; +const int Group::OpenFolderIconNumber = 49; const int Group::RecycleBinIconNumber = 43; const QString Group::RootAutoTypeSequence = "{USERNAME}{TAB}{PASSWORD}{ENTER}"; @@ -1132,7 +1133,8 @@ void Group::applyGroupIconOnCreateTo(Entry* entry) return; } - if (iconNumber() == Group::DefaultIconNumber && iconUuid().isNull()) { + if ((iconNumber() == Group::DefaultIconNumber || iconNumber() == Group::OpenFolderIconNumber) + && iconUuid().isNull()) { return; } diff --git a/src/core/Group.h b/src/core/Group.h index 748437ab1..ab7212886 100644 --- a/src/core/Group.h +++ b/src/core/Group.h @@ -110,6 +110,7 @@ public: bool equals(const Group* other, CompareItemOptions options) const; static const int DefaultIconNumber; + static const int OpenFolderIconNumber; static const int RecycleBinIconNumber; static const QString RootAutoTypeSequence;