diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-08-27 08:14:23 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-08-27 08:14:23 +0200 |
| commit | 8b15d574b49857cdf4df0fd813d68b750d8aee5f (patch) | |
| tree | 1d49cb2b80341523872cef6ccdb770d9d8d1f942 /nx-X11/programs/Xserver/hw/nxagent/Init.c | |
| parent | f24767b3ccfa3f659846f78f32dd13e49dfb1752 (diff) | |
| parent | 3563959c011c00dcbd9dace4d882b222aa31b27f (diff) | |
| download | nx-libs-8b15d574b49857cdf4df0fd813d68b750d8aee5f.tar.gz nx-libs-8b15d574b49857cdf4df0fd813d68b750d8aee5f.tar.bz2 nx-libs-8b15d574b49857cdf4df0fd813d68b750d8aee5f.zip | |
Merge branch 'uli42-pr/fix_background' into 3.6.x
Attributes GH PR #836: https://github.com/ArcticaProject/nx-libs/pull/836
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Init.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Init.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Init.c b/nx-X11/programs/Xserver/hw/nxagent/Init.c index 1e24a618e..2a0bceaf5 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Init.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Init.c @@ -413,7 +413,8 @@ FIXME: These variables, if not removed at all because have probably * background. */ - blackRoot = TRUE; + if (!whiteRoot) + blackRoot = TRUE; nxagentInitKeystrokes(False); |