diff options
| author | Robert David <[email protected]> | 2014-03-10 13:17:56 +0100 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-06-25 11:31:14 +0200 |
| commit | 046dabb3993219c7b1d1c91aad20d49e678ba70b (patch) | |
| tree | 24c70e20370f4adb8336c16077cddfbd16693492 | |
| parent | 2b74916f3405603ef858815bb943ca0f97320608 (diff) | |
| download | marco-046dabb3993219c7b1d1c91aad20d49e678ba70b.tar.bz2 marco-046dabb3993219c7b1d1c91aad20d49e678ba70b.tar.xz | |
src/core/main.c sys/wait.h fix
| -rw-r--r-- | src/compositor/compositor-xrender.c | 4 | ||||
| -rw-r--r-- | src/core/main.c | 4 |
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> |