Avoid deadlock when shutting down.

This commit is contained in:
Alan Jeffrey 2016-06-02 15:12:00 -05:00
parent bdecfa13d2
commit 2416072dc2
7 changed files with 92 additions and 26 deletions

View file

@ -1407,6 +1407,7 @@ impl ScriptThread {
if window.pipeline() == id {
debug!("shutting down layout for root context {:?}", id);
shut_down_layout(&context);
let _ = self.constellation_chan.send(ConstellationMsg::PipelineExited(id));
return true
}
@ -1414,6 +1415,7 @@ impl ScriptThread {
if let Some(ref mut child_context) = context.remove(id) {
shut_down_layout(&child_context);
}
let _ = self.constellation_chan.send(ConstellationMsg::PipelineExited(id));
false
}