1 files changed, 15 insertions, 0 deletions
diff --git a/src/win32/mod.rs b/src/win32/mod.rs
index 891c783..f29bf89 100644
--- a/src/win32/mod.rs
+++ b/src/win32/mod.rs
@@ -133,6 +133,7 @@ impl Window {
             }
         }
 
+        // if one of the received events is `Closed`, setting `is_closed` to true
         if events.iter().find(|e| match e { &&::Closed => true, _ => false }).is_some() {
             use std::sync::atomics::Relaxed;
             self.is_closed.store(true, Relaxed);
@@ -146,10 +147,21 @@ impl Window {
     pub fn wait_events(&self) -> Vec<Event> {
         match self.events_receiver.recv_opt() {
             Ok(ev) => {
+                // if the received event is `Closed`, setting `is_closed` to true
+                match ev {
+                    ::Closed => {
+                        use std::sync::atomics::Relaxed;
+                        self.is_closed.store(true, Relaxed);
+                    },
+                    _ => ()
+                };
+
+                // looing for other possible events in the queue
                 let mut result = self.poll_events();
                 result.insert(0, ev);
                 result
             },
+
             Err(_) => {
                 use std::sync::atomics::Relaxed;
                 self.is_closed.store(true, Relaxed);
@@ -187,6 +199,9 @@ impl Window {
 #[unsafe_destructor]
 impl Drop for Window {
     fn drop(&mut self) {
+        use std::ptr;
+        unsafe { ffi::wglMakeCurrent(ptr::mut_null(), ptr::mut_null()); }
+        unsafe { ffi::wglDeleteContext(self.context); }
         unsafe { ffi::DestroyWindow(self.window); }
     }
 }