2 files changed, 9 insertions, 4 deletions
diff --git a/src/core/display.c b/src/core/display.c
index 9601b4ed..a721def4 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -69,6 +69,10 @@
 #include <X11/extensions/Xrender.h>
 #endif
 
+#ifdef HAVE_PRESENT
+ #include <X11/extensions/Xpresent.h>
+#endif
+
 #ifdef HAVE_XKB
 #include <X11/XKBlib.h>
 #endif
diff --git a/src/core/screen.c b/src/core/screen.c
index 28d2febf..308795e3 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -740,15 +740,16 @@ list_windows (MetaScreen *screen)
 children[i], &info->attrs);
 
 if (meta_error_trap_pop_with_return (screen->display, TRUE))
- {
+ {
 meta_verbose ("Failed to get attributes for window 0x%lx\n",
 children[i]);
- g_free (info);
+ g_free (info);
+ continue;
 }
 else
 {
- info->xwindow = children[i];
- }
+ info->xwindow = children[i];
+ }
 
 result = g_list_prepend (result, info);
 }