summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormonsta <[email protected]>2015-10-26 17:39:59 +0300
committermonsta <[email protected]>2015-10-26 17:39:59 +0300
commit3f2c71401e3e0751bc632f891b53e2fbeb44c398 (patch)
tree9a4a6b0442a9aaf8c6ae3d64ad2a291e50f8b71c
parent3c72336ac601868757c4db6efe320f0814685309 (diff)
downloadmate-desktop-3f2c71401e3e0751bc632f891b53e2fbeb44c398.tar.bz2
mate-desktop-3f2c71401e3e0751bc632f891b53e2fbeb44c398.tar.xz
thumbnail: Fix a code path where the mutex is never unlocked
ported from https://git.gnome.org/browse/gnome-desktop/commit/?id=5b28350d3229d36d7c64084e52f5a40ee5903723
-rw-r--r--libmate-desktop/mate-desktop-thumbnail.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libmate-desktop/mate-desktop-thumbnail.c b/libmate-desktop/mate-desktop-thumbnail.c
index 0178389..9b5272d 100644
--- a/libmate-desktop/mate-desktop-thumbnail.c
+++ b/libmate-desktop/mate-desktop-thumbnail.c
@@ -763,10 +763,11 @@ external_thumbnailers_disabled_changed_cb (GSettings *setting
g_mutex_lock (&priv->lock);
- if (priv->disabled)
- return;
- g_strfreev (priv->disabled_types);
- priv->disabled_types = g_settings_get_strv (priv->settings, "disable");
+ if (!priv->disabled)
+ {
+ g_strfreev (priv->disabled_types);
+ priv->disabled_types = g_settings_get_strv (priv->settings, "disable");
+ }
g_mutex_unlock (&priv->lock);
}