]> git.sesse.net Git - vlc/commitdiff
Fix deadlock when quitting the dummy interface
authorRémi Denis-Courmont <rdenis@simphalempin.com>
Sun, 1 Jun 2008 08:34:41 +0000 (11:34 +0300)
committerRémi Denis-Courmont <rdenis@simphalempin.com>
Sun, 1 Jun 2008 08:34:41 +0000 (11:34 +0300)
src/interface/interface.c

index 9ec0628d49694e42ce4cd684433b55a629307cab..7a39c07af68384da9878dc7fa028e56b4bb7ac8f 100644 (file)
@@ -217,7 +217,12 @@ static void RunInterface( intf_thread_t *p_intf )
         if( p_intf->pf_run )
             p_intf->pf_run( p_intf );
         else
-            while( vlc_object_lock_and_wait( p_intf ) == 0 );
+        {
+            vlc_object_lock( p_intf );
+            while( vlc_object_alive( p_intf ) )
+                vlc_object_wait( p_intf );
+            vlc_object_unlock( p_intf );
+        }
 
         /* Reset play on start status */
         p_intf->b_play = false;