summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/compositor/compositor-xrender.c4
-rw-r--r--src/core/main.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/compositor/compositor-xrender.c b/src/compositor/compositor-xrender.c
index 805002e3..6294e9d7 100644
--- a/src/compositor/compositor-xrender.c
+++ b/src/compositor/compositor-xrender.c
@@ -1821,6 +1821,10 @@ add_win (MetaScreen *screen,
if (xwindow == info->output)
return;
+
+ /* If already added, ignore */
+ if (find_window_for_screen (screen, xwindow) != NULL)
+ return;
cw = g_new0 (MetaCompWindow, 1);
cw->screen = screen;
diff --git a/src/core/main.c b/src/core/main.c
index 48a94677..a12fb75f 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -58,11 +58,7 @@
#include <stdlib.h>
#include <sys/types.h>
-#ifdef __linux__
-#include <wait.h>
-#else
#include <sys/wait.h>
-#endif
#include <stdio.h>
#include <string.h>
#include <signal.h>