Updating branch refs/heads/master to 4f6085ac25592e18ab082b2707d2bffcf2301047 (commit) from 7f6e40bd038bc56fc6b0cb307914b291ab5583d3 (commit)
commit 4f6085ac25592e18ab082b2707d2bffcf2301047 Author: Jannis Pohlmann <jan...@xfce.org> Date: Thu Oct 8 13:55:32 2009 +0200 Make sure to unlock the mutex before returning. Spotted by Philip. tumbler/Makefile.am | 2 +- tumblerd/tumbler-group-scheduler.c | 2 ++ tumblerd/tumbler-lifo-scheduler.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tumbler/Makefile.am b/tumbler/Makefile.am index 6ca5f14..9ff6d2c 100644 --- a/tumbler/Makefile.am +++ b/tumbler/Makefile.am @@ -120,7 +120,7 @@ stamp-tumbler-marshal.h: tumbler-marshal.list Makefile && ( glib-genmarshal \ --prefix=tumbler_marshal \ --header $(srcdir)/tumbler-marshal.list ) >> xgen-emh \ - && echo "#endif /*! __TUMBLER_MARSHAL_H__ */" >> xgen-emh \ + && echo "#endif /* !__TUMBLER_MARSHAL_H__ */" >> xgen-emh \ && ( cmp -s xgen-emh tumbler-marshal.h \ || cp xgen-emh tumbler-marshal.h ) \ && rm -f xgen-emh \ diff --git a/tumblerd/tumbler-group-scheduler.c b/tumblerd/tumbler-group-scheduler.c index f133d90..3a29e77 100644 --- a/tumblerd/tumbler-group-scheduler.c +++ b/tumblerd/tumbler-group-scheduler.c @@ -388,6 +388,7 @@ tumbler_group_scheduler_thread (gpointer data, if (request->unqueued) { tumbler_group_scheduler_finish_request (scheduler, request); + g_mutex_unlock (scheduler->mutex); return; } g_mutex_unlock (scheduler->mutex); @@ -400,6 +401,7 @@ tumbler_group_scheduler_thread (gpointer data, if (request->unqueued) { tumbler_group_scheduler_finish_request (scheduler, request); + g_mutex_unlock (scheduler->mutex); return; } g_mutex_unlock (scheduler->mutex); diff --git a/tumblerd/tumbler-lifo-scheduler.c b/tumblerd/tumbler-lifo-scheduler.c index d314c51..8865183 100644 --- a/tumblerd/tumbler-lifo-scheduler.c +++ b/tumblerd/tumbler-lifo-scheduler.c @@ -321,6 +321,7 @@ tumbler_lifo_scheduler_thread (gpointer data, if (request->unqueued) { tumbler_lifo_scheduler_finish_request (scheduler, request); + g_mutex_unlock (scheduler->mutex); return; } g_mutex_unlock (scheduler->mutex); @@ -333,6 +334,7 @@ tumbler_lifo_scheduler_thread (gpointer data, if (request->unqueued) { tumbler_lifo_scheduler_finish_request (scheduler, request); + g_mutex_unlock (scheduler->mutex); return; } g_mutex_unlock (scheduler->mutex); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits