From: Carl Hetherington <cth@carlh.net>
Date: Mon, 29 May 2023 23:29:28 +0000 (+0200)
Subject: Fix disappearing DKDM folders when dragging a folder into its own child (#2540)
X-Git-Tag: v2.16.58~19
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=575932b8dccb30a02e0cc140b52aede72828a69a

Fix disappearing DKDM folders when dragging a folder into its own child (#2540)
---

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 5393a7fd1..12fa614cc 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -527,6 +527,15 @@ private:
 			group = to->second->parent();
 		}
 
+		/* Check we're not adding a group to one of its children */
+		auto to_parent = group;
+		while (to_parent) {
+			if (from->second == to_parent) {
+				return;
+			}
+			to_parent = to_parent->parent();
+		}
+
 		DCPOMATIC_ASSERT (group);
 		DCPOMATIC_ASSERT (from->second->parent ());