diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-02-21 12:51:44 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-02-21 12:51:44 -0700 |
| commit | f1f826544919b4fa7cdf4bf263abf0c0c1497f70 (patch) | |
| tree | f80ddaf5eccc7c96c8c5e95172cc794573ec7e92 /components/script/timers.rs | |
| parent | 939b13f436d2fc895cf8a57140b0bd50acc53a89 (diff) | |
| parent | cc487979994ec637a3d37f9a3e5edb4a56e7a379 (diff) | |
| download | servo-f1f826544919b4fa7cdf4bf263abf0c0c1497f70.tar.gz servo-f1f826544919b4fa7cdf4bf263abf0c0c1497f70.zip | |
auto merge of #4956 : psdh/servo/interfail, r=jdm
Fixes #4923
Diffstat (limited to 'components/script/timers.rs')
| -rw-r--r-- | components/script/timers.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/components/script/timers.rs b/components/script/timers.rs index 8f361ebcb7b..0b8d7117022 100644 --- a/components/script/timers.rs +++ b/components/script/timers.rs @@ -149,7 +149,10 @@ impl TimerManager { let id = select.wait(); if id == timeout_handle.id() { timeout_port.recv().unwrap(); - script_chan.send(ScriptMsg::FireTimer(source, TimerId(handle))); + if script_chan.send(ScriptMsg::FireTimer(source, TimerId(handle))).is_err() { + break; + } + if is_interval == IsInterval::NonInterval { break; } |