Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove all old layers before adding a new root layer (fixes #2259) #2575

Merged
merged 3 commits into from Jun 4, 2014
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Check the pipeline ID of the new root layer.

This isn't related to any known issue, but is just to ensure that the IDs are
set correctly within this function.
  • Loading branch information
mbrubeck committed Jun 4, 2014
commit 2b0134be7bb8a4372f1a8703b5a1b114e65351f6
@@ -367,8 +367,10 @@ impl IOCompositor {
}
_ => {
match self.root_pipeline {
Some(ref root_pipeline) => (root_pipeline.clone(), LayerId::null()),
None => fail!("Compositor: Received new layer without initialized pipeline"),
Some(ref root_pipeline) if root_pipeline.id == id => {
(root_pipeline.clone(), LayerId::null())
},
_ => fail!("Compositor: Received new layer without initialized pipeline"),
}
}
};
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.