diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-07-01 06:57:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-01 06:57:15 -0700 |
| commit | 210265d30f46cbf12142bf7495493a14497ed1f5 (patch) | |
| tree | 00a1cf9f83cce4ef4e37ef8a9c0f93e9d41b22ab | |
| parent | 736feec0ad14650e21cb899d01e60d168b3e7e2e (diff) | |
| parent | 0078e6c3bbd0244d0de3e9bd9d771d297b012678 (diff) | |
| download | servo-210265d30f46cbf12142bf7495493a14497ed1f5.tar.gz servo-210265d30f46cbf12142bf7495493a14497ed1f5.zip | |
Auto merge of #12030 - servo:exit-now, r=Manishearth
Don't panic in LayoutThread::exit_now() if the paint thread is gone a…
Fixes #11996.
Fixes #12005.
Fixes #12007.
Fixes #12011.
Fixes #12026.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12030)
<!-- Reviewable:end -->
| -rw-r--r-- | components/layout_thread/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs index b33a5c56eb1..e6b716751b7 100644 --- a/components/layout_thread/lib.rs +++ b/components/layout_thread/lib.rs @@ -772,7 +772,7 @@ impl LayoutThread { traversal.shutdown() } - self.paint_chan.send(LayoutToPaintMsg::Exit).unwrap(); + let _ = self.paint_chan.send(LayoutToPaintMsg::Exit); } fn handle_add_stylesheet<'a, 'b>(&self, |