diff options
| author | Emmanuele Bassi <ebassi@linux.intel.com> | 2010-11-23 10:26:15 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@linux.intel.com> | 2010-11-29 18:59:38 +0000 |
| commit | 8a6ac9afcbc77cc0dcba8bc363a364077860a187 (patch) | |
| tree | 24a63f58b5f25556d24d248d23bff9ec553a46b6 | |
| parent | f613ff9cc0dacd36730a388583935dd78a42eed7 (diff) | |
| download | clutter-8a6ac9afcbc77cc0dcba8bc363a364077860a187.tar.gz | |
x11: Ignore NULL settings
Prevent a segfault when dealing with XSETTINGS_ACTION_DELETE.
http://bugzilla.clutter-project.org/show_bug.cgi?id=2441
(cherry picked from commit b8c9ee7e88ca6d1c2e9bc6380740dbf19096e71e)
Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
| -rw-r--r-- | clutter/x11/clutter-backend-x11.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c index 61fc62e17..b51835984 100644 --- a/clutter/x11/clutter-backend-x11.c +++ b/clutter/x11/clutter-backend-x11.c @@ -161,6 +161,9 @@ clutter_backend_x11_xsettings_notify (const char *name, if (name == NULL || *name == '\0') return; + if (setting == NULL) + return; + g_object_freeze_notify (G_OBJECT (settings)); for (i = 0; i < _n_clutter_settings_map; i++) |