diff options
| author | Alan Jeffrey <ajeffrey@mozilla.com> | 2016-06-02 15:12:00 -0500 |
|---|---|---|
| committer | Alan Jeffrey <ajeffrey@mozilla.com> | 2016-06-03 20:05:37 -0500 |
| commit | 2416072dc2b264191ab9a6515a8f9c3415849b71 (patch) | |
| tree | 3020ca786a74c4a00d328441fcf5ee4cdea68263 /components/script/script_thread.rs | |
| parent | bdecfa13d2114281472d5df4548a8faaf8a5bd87 (diff) | |
| download | servo-2416072dc2b264191ab9a6515a8f9c3415849b71.tar.gz servo-2416072dc2b264191ab9a6515a8f9c3415849b71.zip | |
Avoid deadlock when shutting down.
Diffstat (limited to 'components/script/script_thread.rs')
| -rw-r--r-- | components/script/script_thread.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index 35ae783f5ff..ed2b0e03ee8 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -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 } |