From 2b0134be7bb8a4372f1a8703b5a1b114e65351f6 Mon Sep 17 00:00:00 2001 From: Matt Brubeck Date: Wed, 4 Jun 2014 09:39:31 -0700 Subject: [PATCH] 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. --- src/components/main/compositing/compositor.rs | 6 ++++-- 1 file 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"), } } };