From 0bb8538e2ff332e27e05fbbbc92f05ee543aee85 Mon Sep 17 00:00:00 2001 From: Rob Adams Date: Sat, 7 Jun 2003 17:15:33 +0000 Subject: [PATCH] call meta_group_compute_group after setting window->desc to avoid SIGSEGV 2003-06-07 Rob Adams * src/window.c (meta_window_new): call meta_group_compute_group after setting window->desc to avoid SIGSEGV when verbose mode is enabled. --- ChangeLog | 6 ++++++ src/window.c | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 96364d96a..02ad1ab1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-06-07 Rob Adams + + * src/window.c (meta_window_new): call meta_group_compute_group + after setting window->desc to avoid SIGSEGV when verbose mode is + enabled. + 2003-06-07 Havoc Pennington * src/window.c (meta_window_notify_focus): drop the mouse button diff --git a/src/window.c b/src/window.c index 06fd90f02..ddba6a07f 100644 --- a/src/window.c +++ b/src/window.c @@ -347,11 +347,6 @@ meta_window_new (MetaDisplay *display, window->display = display; window->workspaces = NULL; - /* assign the window to its group, or create a new group if needed - */ - window->group = NULL; - meta_window_compute_group (window); - #ifdef HAVE_XSYNC window->update_counter = None; #endif @@ -374,7 +369,12 @@ meta_window_new (MetaDisplay *display, g_assert (window->screen); window->desc = g_strdup_printf ("0x%lx", window->xwindow); - + + /* assign the window to its group, or create a new group if needed + */ + window->group = NULL; + meta_window_compute_group (window); + /* avoid tons of stack updates */ meta_stack_freeze (window->screen->stack);