From dc7e1007b022ad7a24927b375ea14c76eb61c2ee Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Sun, 16 Sep 2007 02:46:32 +0000 Subject: [PATCH] Patch from Alexey Rusakov to prevent a crash on logout with metacity 2007-09-15 Elijah Newren * src/session.c (warn_about_lame_clients_and_finish_interact): Patch from Alexey Rusakov to prevent a crash on logout with metacity subsequently not being restored in future sessions. Fixes #433253. svn path=/trunk/; revision=3340 --- ChangeLog | 7 +++++++ src/session.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0341dfddf..dfaa3a250 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-09-15 Elijah Newren + + * src/session.c (warn_about_lame_clients_and_finish_interact): + Patch from Alexey Rusakov to prevent a crash on logout with + metacity subsequently not being restored in future sessions. + Fixes #433253. + 2007-09-01 Elijah Newren * HACKING: update; cvs->svn & mention GConf needed diff --git a/src/session.c b/src/session.c index 4c247509a..51faed970 100644 --- a/src/session.c +++ b/src/session.c @@ -1804,9 +1804,6 @@ warn_about_lame_clients_and_finish_interact (gboolean shutdown) display_iter = display_iter->next; } - /* don't need to free displays */ - displays = NULL; - if (lame == NULL) { /* No lame apps. */ @@ -1819,6 +1816,9 @@ warn_about_lame_clients_and_finish_interact (gboolean shutdown) timestamp = meta_display_get_current_time_roundtrip (displays->data); sprintf (timestampbuf, "%u", timestamp); + /* don't need to free displays */ + displays = NULL; + len = g_slist_length (lame); len *= 2; /* titles and also classes */ len += 2; /* --timestamp flag and actual timestamp */