metacity r3655 - in trunk: . src/core

[iain svn gnome org]

Author: iain
Date: Wed Mar 19 11:51:10 2008
New Revision: 3655
URL: http://svn.gnome.org/viewvc/metacity?rev=3655&view=rev

Log:
2008-03-19  Iain Holmes  <iain gnome org>

        * src/core/compositor.c (meta_compositor_set_active_window): 
Handle
        compositor being disabled and don't crash.



Modified:
   trunk/ChangeLog
   trunk/src/core/compositor.c

Modified: trunk/src/core/compositor.c
==============================================================================
--- trunk/src/core/compositor.c	(original)
+++ trunk/src/core/compositor.c	Wed Mar 19 11:51:10 2008
@@ -2744,11 +2744,19 @@
                                    MetaWindow     *window)
 {
 #ifdef HAVE_COMPOSITE_EXTENSIONS
-  MetaDisplay *display = compositor->display;
-  Display *xdisplay = display->xdisplay;
+  MetaDisplay *display;
+  Display *xdisplay;
   MetaCompWindow *old_focus = NULL, *new_focus = NULL;
-  MetaCompScreen *info = screen->compositor_data;
-  MetaWindow *old_focus_win = info->focus_window;
+  MetaCompScreen *info;
+  MetaWindow *old_focus_win;
+
+  if (compositor == NULL)
+    return;
+
+  display = compositor->display;
+  xdisplay = display->xdisplay;
+  info = screen->compositor_data;
+  old_focus_win = info->focus_window;
 
   if (old_focus_win) 
     {