Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #6666 - glennw:exit-flag, r=larsbergstrom

Browse source 
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 -->
This commit is contained in:
bors-servo 2015-07-20 15:37:33 -06:00
commit 5ac80bff8e
6 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ports/cef/Cargo.lock generated
View file

@ -494,7 +494,7 @@ dependencies = [
[[package]]
name = "glutin"
version = "0.0.26"
source = "git+https://github.com/servo/glutin?branch=servo#4cf15370a18d6327d159fb4f9950061bf1b715f6"
source = "git+https://github.com/servo/glutin?branch=servo#c6d08b017703abcb00221462fb8ebbfad3495374"
dependencies = [
"android_glue 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"cocoa 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",

2
ports/glutin/window.rs
View file

@ -345,7 +345,7 @@ impl Window {
// When writing to a file then exiting, use event
// polling so that we don't block on a GUI event
// such as mouse click.
if opts::get().output_file.is_some() {
if opts::get().output_file.is_some() || opts::get().exit_after_load {
while let Some(event) = self.window.poll_events().next() {
close_event = self.handle_window_event(event) || close_event;
}