Skip to content
Snippets Groups Projects
Commit 751ded74 authored by Aaron Councilman's avatar Aaron Councilman
Browse files

Improve fork coalesce check for intermediate control

parent 4754a909
No related branches found
No related tags found
1 merge request!205Fork reshape
...@@ -642,27 +642,15 @@ pub fn fork_coalesce_helper( ...@@ -642,27 +642,15 @@ pub fn fork_coalesce_helper(
} }
// Check for control between join-join and fork-fork // Check for control between join-join and fork-fork
let Some(user) = editor let (control, _) = editor.node(inner_fork).try_fork().unwrap();
.get_users(outer_fork)
.filter(|node| editor.func().nodes[node.idx()].is_control())
.next()
else {
return None;
};
if user != inner_fork { if control != outer_fork {
return None; return None;
} }
let Some(user) = editor let control = editor.node(outer_join).try_join().unwrap();
.get_users(inner_join)
.filter(|node| editor.func().nodes[node.idx()].is_control())
.next()
else {
return None;
};
if user != outer_join { if control != inner_join {
return None; return None;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment