aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Screen.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-10-22 14:35:08 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-10-22 14:35:08 +0200
commit7392dd6a9b550538a5b7f2aa5204c805c15a9d6a (patch)
treee2f5a8fc5b50ed8eeeb018ffb7051f888b7dd5f1 /nx-X11/programs/Xserver/hw/nxagent/Screen.c
parentc478ba2937b6a7e6c55b615ddeac3ca525f6a743 (diff)
parent450760bcafc8d2a708b9f6087f3c0c2cdab046a8 (diff)
downloadnx-libs-7392dd6a9b550538a5b7f2aa5204c805c15a9d6a.tar.gz
nx-libs-7392dd6a9b550538a5b7f2aa5204c805c15a9d6a.tar.bz2
nx-libs-7392dd6a9b550538a5b7f2aa5204c805c15a9d6a.zip
Merge branch 'uli42-pr/cleanup_wmisrunning' into 3.6.x
Attributes GH PR #728: https://github.com/ArcticaProject/nx-libs/pull/728
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Screen.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index b5aabf8bd..d8cf695a0 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -977,7 +977,7 @@ Bool nxagentOpenScreen(ScreenPtr pScreen,
* fullscreen mode.
*/
- if (nxagentOption(Rootless) == False && nxagentWMIsRunning == False)
+ if (nxagentOption(Rootless) == False && !nxagentWMIsRunning)
{
#ifdef TEST
fprintf(stderr, "nxagentOpenScreen: Forcing fullscreen mode with no window manager running.\n");
@@ -3057,7 +3057,7 @@ int nxagentShadowPoll(PixmapPtr nxagentShadowPixmapPtr, GCPtr nxagentShadowGCPtr
if (result == 1)
{
- if (nxagentWMPassed == 0)
+ if (!nxagentWMPassed)
{
nxagentRemoveSplashWindow(NULL);
}