projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix disappearing DKDM folders when dragging a folder into its own child (#2540)
[dcpomatic.git]
/
src
/
tools
/
dcpomatic_kdm.cc
diff --git
a/src/tools/dcpomatic_kdm.cc
b/src/tools/dcpomatic_kdm.cc
index 5393a7fd17476ad0a5cb02da25bbe55c7b49f7bd..12fa614ccabce6f3423336d5ed668eeb5eeef9d8 100644
(file)
--- a/
src/tools/dcpomatic_kdm.cc
+++ b/
src/tools/dcpomatic_kdm.cc
@@
-527,6
+527,15
@@
private:
group = to->second->parent();
}
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 ());
DCPOMATIC_ASSERT (group);
DCPOMATIC_ASSERT (from->second->parent ());