Merge pull request #1349 from isanae/master

Handle category cycles by putting parent ids in a set

1 files changed, 3 insertions, 2 deletions

diff --git a/src/categories.h b/src/categories.h
index e8ec763b..e4a3ede9 100644
--- a/src/categories.h
+++ b/src/categories.h
@@ -124,7 +124,7 @@ public:
    * @param parentID the parent id to test for

    * @return true if id is a child of parentID

    **/

-  bool isDecendantOf(int id, int parentID) const;

+  bool isDescendantOf(int id, int parentID) const;

 

   /**

    * @brief test if the specified category has child categories

@@ -209,7 +209,8 @@ private:
   std::map<int, unsigned int> m_NexusMap;

 

 private:

-

+  // called by isDescendantOf()

+  bool isDescendantOfImpl(int id, int parentID, std::set<int>& seen) const;

 };