diff --git a/ChangeLog b/ChangeLog
index 2a76e667af..0b8148557a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-27  Julien MOUTTE  <julien@moutte.net>
+
+	* sys/ximage/ximagesink.c: (gst_ximagesink_xwindow_decorate):
+	* sys/xvimage/xvimagesink.c: (gst_xvimagesink_xwindow_decorate): When
+	the atom is not available we have to unlock the mutex. Fixes #148023
+
 2004-07-26  Steve Lhomme  <steve.lhomme@free.fr>
 
 	* gst-libs/gst/media-info/media-info.h:
diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c
index ee03feb89c..dc8bc3a856 100644
--- a/sys/ximage/ximagesink.c
+++ b/sys/ximage/ximagesink.c
@@ -320,6 +320,7 @@ gst_ximagesink_xwindow_decorate (GstXImageSink * ximagesink,
 
   hints_atom = XInternAtom (ximagesink->xcontext->disp, "_MOTIF_WM_HINTS", 1);
   if (hints_atom == None) {
+    g_mutex_unlock (ximagesink->x_lock);
     return FALSE;
   }
 
diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index a27488cf08..82183c4d41 100644
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -339,6 +339,7 @@ gst_xvimagesink_xwindow_decorate (GstXvImageSink * xvimagesink,
 
   hints_atom = XInternAtom (xvimagesink->xcontext->disp, "_MOTIF_WM_HINTS", 1);
   if (hints_atom == None) {
+    g_mutex_unlock (xvimagesink->x_lock);
     return FALSE;
   }