[xine-cvs] CVS: gnome-xine/src lirc.c,1.13,1.14

[Darren S. <ds...@us...>]

Update of /cvsroot/xine/gnome-xine/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20792/src

Modified Files:
	lirc.c 
Log Message:
Fix locking bug if lircd isn't running.

Index: lirc.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/lirc.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- lirc.c	12 Dec 2005 20:46:28 -0000	1.13
+++ lirc.c	20 Dec 2005 19:56:58 -0000	1.14
@@ -130,8 +130,10 @@
       fprintf (stderr,
 	       _("lirc: cannot initialise - disabling remote control\n"
 	         "lirc: maybe lircd isn't running or you can't connect to the socket?\n"));
+      failed:
       gxine_lirc_thread = 0;
       pthread_cond_signal (&lirc_init_cond);
+      pthread_mutex_unlock (&lirc_init_mutex);
       pthread_exit(NULL);
       return NULL;
     }
@@ -147,10 +149,7 @@
       /* if neither file has been read successfully or there's nothing for
        * gxine, exit now */
       puts (_("lirc: no configuration found - disabling remote control"));
-      gxine_lirc_thread = 0;
-      pthread_cond_signal (&lirc_init_cond);
-      pthread_exit (NULL);
-      return NULL;
+      goto failed;
     }
 
     pthread_cond_signal (&lirc_init_cond);