Merge pull request #6834 from albert-github/feature/bug_399222

Bug 399222 - SORT_BRIEF_DOCS produces wrong results

2 files changed, 15 insertions, 0 deletions

diff --git a/src/filedef.cpp b/src/filedef.cpp
index f9f68d1..187b665 100644
--- a/src/filedef.cpp
+++ b/src/filedef.cpp
@@ -1966,6 +1966,18 @@ void FileDef::sortMemberLists()
   {
     if (ml->needsSorting()) { ml->sort(); ml->setNeedsSorting(FALSE); }
   }
+
+  if (m_memberGroupSDict)
+  {
+    MemberGroupSDict::Iterator mgli(*m_memberGroupSDict);
+    MemberGroup *mg;
+    for (;(mg=mgli.current());++mgli)
+    {
+      MemberList *mlg = mg->members();
+      if (mlg->needsSorting()) { mlg->sort(); mlg->setNeedsSorting(FALSE); }
+    }
+  }
+
 }
 
 MemberList *FileDef::getMemberList(MemberListType lt) const
diff --git a/src/membergroup.cpp b/src/membergroup.cpp
index 3e8fea9..9c48668 100644
--- a/src/membergroup.cpp
+++ b/src/membergroup.cpp
@@ -43,8 +43,11 @@ MemberGroup::MemberGroup()
 MemberGroup::MemberGroup(Definition *parent,
       int id,const char *hdr,const char *d,const char *docFile,int docLine)
 {
+  static bool sortBriefDocs = Config_getBool(SORT_BRIEF_DOCS);
+
   //printf("New member group id=%d header=%s desc=%s\n",id,hdr,d);
   memberList      = new MemberList(MemberListType_memberGroup);
+  memberList->setNeedsSorting(sortBriefDocs); // detailed sections are already sorted elsewhere.
   grpId           = id;
   grpHeader       = hdr;
   doc             = d;