diff options
| author | bors-servo <release+servo@mozilla.com> | 2013-08-23 09:30:32 -0700 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2013-08-23 09:30:32 -0700 |
| commit | d70178da86985aa39dad0f688f78f3cc8513f586 (patch) | |
| tree | c41944a2d92136bf3c932dd361389a0a055502d0 /src | |
| parent | a074267e23814a155dcfb750b710b82590cef674 (diff) | |
| parent | ecfa798abca02da5be7eb63667da238ecdd5282c (diff) | |
| download | servo-d70178da86985aa39dad0f688f78f3cc8513f586.tar.gz servo-d70178da86985aa39dad0f688f78f3cc8513f586.zip | |
auto merge of #772 : larsbergstrom/servo/profile-chan-fix, r=jdm
Will exit during shutdown instead of crashing trying to recv on a closed port.
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/util/time.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/components/util/time.rs b/src/components/util/time.rs index cfdb037c4f0..4dda2457ef9 100644 --- a/src/components/util/time.rs +++ b/src/components/util/time.rs @@ -131,8 +131,11 @@ impl Profiler { pub fn start(&mut self) { loop { - let msg = self.port.recv(); - self.handle_msg(msg); + let msg = self.port.try_recv(); + match msg { + Some (msg) => self.handle_msg(msg), + None => break + } } } |