Auto merge of #57 - paulrouget:fixcrash, r=jdm

allocate buffer every time Fix #56
servo · Sep 18, 2019 · bf4e5a5 · bf4e5a5
2 parents 319b63b + 3ae7160
commit bf4e5a5
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/webxr/openxr/mod.rs b/webxr/openxr/mod.rs
@@ -266,11 +266,12 @@ impl OpenXrDevice {
     }
 
     fn handle_openxr_events(&mut self) {
-        let mut buffer = openxr::EventDataBuffer::new();
-        while let Some(event) = self.instance.poll_event(&mut buffer).unwrap() {
-            use openxr::Event::*;
+        use openxr::Event::*;
+        loop {
+            let mut buffer = openxr::EventDataBuffer::new();
+            let event = self.instance.poll_event(&mut buffer).unwrap();
             match event {
-                SessionStateChanged(session_change) => match session_change.state() {
+                Some(SessionStateChanged(session_change)) => match session_change.state() {
                     openxr::SessionState::STOPPING => {
                         self.events.callback(Event::SessionEnd);
                         self.session.end().unwrap();
@@ -280,9 +281,13 @@ impl OpenXrDevice {
                         // FIXME: Handle other states
                     }
                 },
-                _ => {
+                Some(_) => {
                     // FIXME: Handle other events
                 }
+                None => {
+                    // No more events to process
+                    break;
+                }
             }
         }
     }