X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Fhotkeys.c;h=f62a3f4084bb327762c0dddcfc648982b77bf0b4;hb=de050c43bdc37fd06a1d186c075c587ec81ce85f;hp=87cdda4f42f1da829b5353e10f48965e93a3c475;hpb=8fec091327c0a2bf0927981bca52fe2f6fabcc72;p=vlc

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index 87cdda4f42..f62a3f4084 100644
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -154,7 +154,7 @@ static void Run( intf_thread_t *p_intf )
         var_Set( p_intf->p_libvlc, p_hotkeys[i].psz_action, val );
     }
 
-    while( !intf_ShouldDie( p_intf ) )
+    for( vlc_bool_t b_quit = VLC_FALSE ; !b_quit; )
     {
         int i_key, i_action;
         int i_times = 0;
@@ -204,11 +204,8 @@ static void Run( intf_thread_t *p_intf )
 
         if( !i_action )
         {
-            vlc_mutex_lock( &p_intf->object_lock );
-            vlc_cond_wait( &p_intf->object_wait, &p_intf->object_lock );
-            vlc_mutex_unlock( &p_intf->object_lock );
+            b_quit = vlc_object_lock_and_wait( p_intf );
             /* No key pressed, sleep a bit more */
-//            msleep( INTF_IDLE_SLEEP );
             continue;
         }