Commit a5789854 authored by Hannes Domani's avatar Hannes Domani Committed by Rémi Denis-Courmont

oldrc: fix thread-cancellation on windows (fixes #10483)

Signed-off-by: default avatarRémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 09cc30dff2dfca9ec993c7bf245942ca5735ebf0)
parent f5e85d90
...@@ -1798,8 +1798,8 @@ static bool ReadWin32( intf_thread_t *p_intf, char *p_buffer, int *pi_size ) ...@@ -1798,8 +1798,8 @@ static bool ReadWin32( intf_thread_t *p_intf, char *p_buffer, int *pi_size )
DWORD i_dw; DWORD i_dw;
/* On Win32, select() only works on socket descriptors */ /* On Win32, select() only works on socket descriptors */
while( WaitForSingleObject( p_intf->p_sys->hConsoleIn, while( WaitForSingleObjectEx( p_intf->p_sys->hConsoleIn,
INTF_IDLE_SLEEP/1000 ) == WAIT_OBJECT_0 ) INTF_IDLE_SLEEP/1000, TRUE ) == WAIT_OBJECT_0 )
{ {
while( *pi_size < MAX_LINE_LENGTH && while( *pi_size < MAX_LINE_LENGTH &&
ReadConsoleInput( p_intf->p_sys->hConsoleIn, &input_record, ReadConsoleInput( p_intf->p_sys->hConsoleIn, &input_record,
...@@ -1853,6 +1853,8 @@ static bool ReadWin32( intf_thread_t *p_intf, char *p_buffer, int *pi_size ) ...@@ -1853,6 +1853,8 @@ static bool ReadWin32( intf_thread_t *p_intf, char *p_buffer, int *pi_size )
} }
} }
vlc_testcancel ();
return false; return false;
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment