aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/components/main/compositing/compositor.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/components/main/compositing/compositor.rs b/src/components/main/compositing/compositor.rs
index 261ab4b411e..7f3f14729f1 100644
--- a/src/components/main/compositing/compositor.rs
+++ b/src/components/main/compositing/compositor.rs
@@ -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"),
}
}
};