summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2023-05-30 01:29:28 +0200
committerCarl Hetherington <cth@carlh.net>2023-05-30 01:29:28 +0200
commit7a2e3f937d8334018573424156998c7a3f92d65d (patch)
treed34ce164206fd2eb6665cf901a0b3e56306a41c5
parent395d753b81bce0c5ca32f5662eb959d915ebdcdc (diff)
Fix disappearing DKDM folders when dragging into its own child.2540-dkdm-folders
-rw-r--r--src/tools/dcpomatic_kdm.cc9
1 files changed, 9 insertions, 0 deletions
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 ());