diff options
| author | Anthony Ramine <nox@nox.paris> | 2020-05-15 12:12:37 +0200 |
|---|---|---|
| committer | Anthony Ramine <nox@nox.paris> | 2020-05-18 10:23:45 +0200 |
| commit | f4c4af2bd485b88b7928d9a0ac35a06db2907e70 (patch) | |
| tree | d0da11dee2e1f739cda0613575014c7e43a88ecc /components/layout_2020/dom_traversal.rs | |
| parent | 50bd5c3e0f9166a9fa049b95f23251ad7626f8de (diff) | |
| download | servo-f4c4af2bd485b88b7928d9a0ac35a06db2907e70.tar.gz servo-f4c4af2bd485b88b7928d9a0ac35a06db2907e70.zip | |
Don't panic while already panicking in BoxSlot::drop
Diffstat (limited to 'components/layout_2020/dom_traversal.rs')
| -rw-r--r-- | components/layout_2020/dom_traversal.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/components/layout_2020/dom_traversal.rs b/components/layout_2020/dom_traversal.rs index a8f5a17fc1d..c043d3b75d3 100644 --- a/components/layout_2020/dom_traversal.rs +++ b/components/layout_2020/dom_traversal.rs @@ -346,8 +346,10 @@ impl BoxSlot<'_> { impl Drop for BoxSlot<'_> { fn drop(&mut self) { - if let Some(slot) = &mut self.slot { - assert!(slot.borrow().is_some(), "failed to set a layout box"); + if !std::thread::panicking() { + if let Some(slot) = &mut self.slot { + assert!(slot.borrow().is_some(), "failed to set a layout box"); + } } } } |