Bug Fix 🐛

	modified:   Cargo.lock
	modified:   Cargo.toml
	modified:   README.md
	modified:   src/capture.rs
	modified:   src/graphics_capture_api.rs
	modified:   src/lib.rs
	modified:   src/window.rs
	modified:   windows-capture-python/Cargo.lock
	modified:   windows-capture-python/Cargo.toml
	modified:   windows-capture-python/pyproject.toml

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "windows-capture"
-version = "1.0.42"
+version = "1.0.44"
 authors = ["NiiightmareXD"]
 edition = "2021"
 description = "Fastest Windows Screen Capture Library For Rust 🔥"

README.md

@@ -18,7 +18,7 @@ Add this library to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-windows-capture = "1.0.42"
+windows-capture = "1.0.44"
 ```
 or run this command
 

src/capture.rs

@@ -176,6 +176,10 @@ pub trait WindowsCaptureHandler: Sized {
         };
         let controller = unsafe { CreateDispatcherQueueController(options)? };
 
+        // Debug Thread ID
+        let thread_id = unsafe { GetCurrentThreadId() };
+        debug!("Thread ID: {thread_id}");
+
         // Start Capture
         info!("Starting Capture Thread");
         let callback = Arc::new(Mutex::new(Self::new(settings.flags)?));
@@ -185,12 +189,10 @@ pub trait WindowsCaptureHandler: Sized {
             settings.capture_cursor,
             settings.draw_border,
             settings.color_format,
+            thread_id,
         )?;
         capture.start_capture()?;
 
-        // Debug Thread ID
-        debug!("Thread ID: {}", unsafe { GetCurrentThreadId() });
-
         // Message Loop
         trace!("Entering Message Loop");
         let mut message = MSG::default();
@@ -263,6 +265,10 @@ pub trait WindowsCaptureHandler: Sized {
             };
             let controller = unsafe { CreateDispatcherQueueController(options)? };
 
+            // Debug Thread ID
+            let thread_id = unsafe { GetCurrentThreadId() };
+            debug!("Thread ID: {thread_id}");
+
             // Start Capture
             info!("Starting Capture Thread");
             let callback = Arc::new(Mutex::new(Self::new(settings.flags)?));
@@ -272,6 +278,7 @@ pub trait WindowsCaptureHandler: Sized {
                 settings.capture_cursor,
                 settings.draw_border,
                 settings.color_format,
+                thread_id,
             )?;
             capture.start_capture()?;
 
@@ -284,9 +291,6 @@ pub trait WindowsCaptureHandler: Sized {
             trace!("Sending Callback");
             callback_sender.send(callback)?;
 
-            // Debug Thread ID
-            debug!("Thread ID: {}", unsafe { GetCurrentThreadId() });
-
             // Message Loop
             trace!("Entering Message Loop");
             let mut message = MSG::default();

src/graphics_capture_api.rs

@@ -17,11 +17,12 @@ use windows::{
         DirectX::{Direct3D11::IDirect3DDevice, DirectXPixelFormat},
     },
     Win32::{
+        Foundation::{LPARAM, WPARAM},
         Graphics::Direct3D11::{
             ID3D11Device, ID3D11DeviceContext, ID3D11Texture2D, D3D11_TEXTURE2D_DESC,
         },
         System::WinRT::Direct3D11::IDirect3DDxgiInterfaceAccess,
-        UI::WindowsAndMessaging::PostQuitMessage,
+        UI::WindowsAndMessaging::{PostThreadMessageW, WM_QUIT},
     },
 };
 
@@ -89,6 +90,7 @@ impl GraphicsCaptureApi {
         capture_cursor: Option<bool>,
         draw_border: Option<bool>,
         color_format: ColorFormat,
+        thread_id: u32,
     ) -> Result<Self, Box<dyn Error + Send + Sync>> {
         // Check Support
         if !ApiInformation::IsApiContractPresentByMajor(
@@ -136,16 +138,23 @@ impl GraphicsCaptureApi {
                 move |_, _| {
                     halt_closed.store(true, atomic::Ordering::Relaxed);
 
-                    // To Stop Messge Loop
-                    unsafe { PostQuitMessage(0) };
-
                     // Notify The Struct That The Capture Session Is Closed
                     let result = callback_closed.lock().on_closed();
 
                     let _ = RESULT
                         .replace(Some(result))
                         .expect("Failed To Replace RESULT");
 
+                    // To Stop Messge Loop
+                    unsafe {
+                        PostThreadMessageW(
+                            thread_id,
+                            WM_QUIT,
+                            WPARAM::default(),
+                            LPARAM::default(),
+                        )?;
+                    };
+
                     Result::Ok(())
                 }
             }),
@@ -245,7 +254,14 @@ impl GraphicsCaptureApi {
                         halt_frame_pool.store(true, atomic::Ordering::Relaxed);
 
                         // To Stop Messge Loop
-                        unsafe { PostQuitMessage(0) };
+                        unsafe {
+                            PostThreadMessageW(
+                                thread_id,
+                                WM_QUIT,
+                                WPARAM::default(),
+                                LPARAM::default(),
+                            )?;
+                        };
                     }
 
                     Result::Ok(())

src/lib.rs

@@ -22,7 +22,7 @@
 //!
 //! ```toml
 //! [dependencies]
-//! windows-capture = "1.0.42"
+//! windows-capture = "1.0.44"
 //! ```
 //! or run this command
 //!

src/window.rs

@@ -76,7 +76,7 @@ impl Window {
         let len = unsafe { GetWindowTextLengthW(self.window) };
 
         let mut name = vec![0u16; len as usize + 1];
-        if len > 1 {
+        if len >= 1 {
             let copied = unsafe { GetWindowTextW(self.window, &mut name) };
             if copied == 0 {
                 return Ok(String::new());

windows-capture-python/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "windows-capture-python"
-version = "1.0.42"
+version = "1.0.44"
 authors = ["NiiightmareXD"]
 edition = "2021"
 description = "Fastest Windows Screen Capture Library For Python 🔥"

windows-capture-python/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "windows-capture"
-version = "1.0.42"
+version = "1.0.44"
 description = "Fastest Windows Screen Capture Library For Python 🔥"
 readme = "README.md"
 requires-python = ">=3.9"