summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren gmail com>2006-05-26 16:51:03 +0000
committerElijah Newren <newren@src.gnome.org>2006-05-26 16:51:03 +0000
commitdb87abfb194fc1bf4ae75d11794cc5fab4d382c1 (patch)
tree8924753857229965b0548bd0c74944a724779b27
parent35b47b59ab9fb3d9ee930dfdc0bf94cb2a6ca629 (diff)
downloadmetacity-db87abfb194fc1bf4ae75d11794cc5fab4d382c1.tar.gz
Fix a crash on exit/logout from assuming a compositor would always exist
2006-05-26 Elijah Newren <newren gmail com> * src/display.c (meta_display_close): Fix a crash on exit/logout from assuming a compositor would always exist
-rw-r--r--ChangeLog5
-rw-r--r--src/display.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 805df7d2..572944b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-26 Elijah Newren <newren gmail com>
+
+ * src/display.c (meta_display_close): Fix a crash on exit/logout
+ from assuming a compositor would always exist
+
2006-05-25 Elijah Newren <newren gmail com>
* src/place.h:
diff --git a/src/display.c b/src/display.c
index 63147a8b..cf02a9e2 100644
--- a/src/display.c
+++ b/src/display.c
@@ -900,7 +900,8 @@ meta_display_close (MetaDisplay *display)
meta_display_shutdown_keys (display);
- meta_compositor_unref (display->compositor);
+ if (display->compositor)
+ meta_compositor_unref (display->compositor);
g_free (display);