diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-07-20 15:37:33 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-07-20 15:37:33 -0600 |
| commit | 5ac80bff8e25be65e96daaf6b7403b11d23d561a (patch) | |
| tree | 647d9ca1144dc5df63f99cb8110c089ea1b68133 /components/layout | |
| parent | 58e9bc6583b6ebbeb27e3b28a6b271ee48cd695a (diff) | |
| parent | 4f28c93f4003817305283dcc80bf56db5ce46b02 (diff) | |
| download | servo-5ac80bff8e25be65e96daaf6b7403b11d23d561a.tar.gz servo-5ac80bff8e25be65e96daaf6b7403b11d23d561a.zip | |
Auto merge of #6666 - glennw:exit-flag, r=larsbergstrom
Restore exit after load command line flag.
Also updates glutin with a crash fix that was exposed by this patch.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6666)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout')
| -rw-r--r-- | components/layout/context.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/components/layout/context.rs b/components/layout/context.rs index 353d37d9d0c..cd7615e1a97 100644 --- a/components/layout/context.rs +++ b/components/layout/context.rs @@ -183,7 +183,8 @@ impl<'a> LayoutContext<'a> { Err(state) => { // If we are emitting an output file, then we need to block on // image load or we risk emitting an output file missing the image. - let is_sync = opts::get().output_file.is_some(); + let is_sync = opts::get().output_file.is_some() || + opts::get().exit_after_load; match (state, is_sync) { // Image failed to load, so just return nothing |