aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout
diff options
context:
space:
mode:
authorGlenn Watson <gw@intuitionlibrary.com>2015-07-20 08:28:19 +1000
committerGlenn Watson <gw@intuitionlibrary.com>2015-07-20 11:19:13 +1000
commit4f28c93f4003817305283dcc80bf56db5ce46b02 (patch)
treedbedddbea31df62653e1cb668eb7b354a2fa5169 /components/layout
parent2f4bdc6ad631dc56b64622e3390943b59270b3ae (diff)
downloadservo-4f28c93f4003817305283dcc80bf56db5ce46b02.tar.gz
servo-4f28c93f4003817305283dcc80bf56db5ce46b02.zip
Restore exit after load command line flag.
Also updates glutin with a crash fix that was exposed by this patch.
Diffstat (limited to 'components/layout')
-rw-r--r--components/layout/context.rs3
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