diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-11-02 11:40:04 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-11-02 11:40:04 +0100 |
| commit | eb8c16ef9d24add2e0912269775d586d7d4061e4 (patch) | |
| tree | 75a0ce4167c351512b1226cefc5630297f1b4384 /nx-X11/programs/Xserver/hw/nxagent/Window.c | |
| parent | 5f806ddfdb46c9a727b00ac96a6b939c447ca488 (diff) | |
| parent | 7675af8e1323925badd313adf3ec8333984d7ee1 (diff) | |
| download | nx-libs-eb8c16ef9d24add2e0912269775d586d7d4061e4.tar.gz nx-libs-eb8c16ef9d24add2e0912269775d586d7d4061e4.tar.bz2 nx-libs-eb8c16ef9d24add2e0912269775d586d7d4061e4.zip | |
Merge branch 'uli42-pr/simplify_nxwindow' into 3.6.x
Attributes GH PR #866: https://github.com/ArcticaProject/nx-libs/pull/866
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Window.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Window.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c index 88110e7dc..ecf662f90 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Window.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c @@ -2538,6 +2538,10 @@ void nxagentMapDefaultWindows(void) WindowPtr pWin = screenInfo.screens[i]->root; ScreenPtr pScreen = pWin -> drawable.pScreen; + /* + * InitRootWindow does that already, but as MapWindow() is + * idempotent we keep it here, too + */ MapWindow(pWin, serverClient); if (nxagentOption(Rootless) == 0) |