Corrections to sharing data

1 files changed, 8 insertions, 8 deletions

diff --git a/src/api/win32/init.rs b/src/api/win32/init.rs
index 6b52660..26ccba6 100644
--- a/src/api/win32/init.rs
+++ b/src/api/win32/init.rs
@@ -5,7 +5,7 @@ use std::mem;
 use std::thread;
 
 use super::callback;
-use super::callback::WindowState;
+use super::WindowState;
 use super::Window;
 use super::MonitorId;
 use super::WindowWrapper;
@@ -215,8 +215,11 @@ unsafe fn init(title: Vec<u16>, window: &WindowAttributes, pf_reqs: &PixelFormat
         user32::SetForegroundWindow(real_window.0);
     }
 
-    // Creating a mutex to track the current cursor state
-    let cursor_state = CursorState::Normal;
+    // Creating a mutex to track the current window state
+    let window_state = Arc::new(Mutex::new(WindowState {
+        cursor_state: CursorState::Normal,
+        attributes: window.clone()
+    }));
 
     // filling the CONTEXT_STASH task-local storage so that we can start receiving events
     let events_receiver = {
@@ -226,10 +229,7 @@ unsafe fn init(title: Vec<u16>, window: &WindowAttributes, pf_reqs: &PixelFormat
             let data = callback::ThreadLocalData {
                 win: real_window.0,
                 sender: tx.take().unwrap(),
-                window_state: Arc::new(Mutex::new(WindowState {
-                    cursor_state: cursor_state.clone(),
-                    attributes: window.clone()
-                }))
+                window_state: window_state.clone()
             };
             (*context_stash.borrow_mut()) = Some(data);
         });
@@ -241,7 +241,7 @@ unsafe fn init(title: Vec<u16>, window: &WindowAttributes, pf_reqs: &PixelFormat
         window: real_window,
         context: context,
         events_receiver: events_receiver,
-        cursor_state: cursor_state,
+        window_state: window_state,
     })
 }