input: treat negative deadline as no deadline in ControlPop()

2f4d5964 · Rémi Denis-Courmont · 43464204 · 2f4d5964
Commit 2f4d5964 authored Feb 21, 2015 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

src/input/input.c src/input/input.c +9 -4

No files found.
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -1482,12 +1482,17 @@ static inline int ControlPop( input_thread_t *p_input,
            return VLC_EGENERIC;
        }
-        if( vlc_cond_timedwait( &p_sys->wait_control, &p_sys->lock_control,
+        if( i_deadline >= 0 )
-                                i_deadline ) )
        {
-            vlc_mutex_unlock( &p_sys->lock_control );
+            if( vlc_cond_timedwait( &p_sys->wait_control, &p_sys->lock_control,
-            return VLC_EGENERIC;
+                                    i_deadline ) )
+            {
+                vlc_mutex_unlock( &p_sys->lock_control );
+                return VLC_EGENERIC;
+            }
        }
+        else
+            vlc_cond_wait( &p_sys->wait_control, &p_sys->lock_control );
    }
    /* */