aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-06-11 14:26:35 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-06-11 14:26:35 +0200
commit4f216e7cf7571885f2995433580c9a3ec068eef4 (patch)
treee767e70c6aeb95b5d13be127f38d850ec0f30abf /nx-X11
parent7fd59fbd1effa4eb54fb338239f22ff8a23d9da6 (diff)
parent19116a61c98684fc5c0256b65f49462457bb0f5b (diff)
downloadnx-libs-4f216e7cf7571885f2995433580c9a3ec068eef4.tar.gz
nx-libs-4f216e7cf7571885f2995433580c9a3ec068eef4.tar.bz2
nx-libs-4f216e7cf7571885f2995433580c9a3ec068eef4.zip
Merge branch 'uli42-pr/fix_sync_segfault' into 3.6.x
Attributes GH PR #466: https://github.com/ArcticaProject/nx-libs/pull/466
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Args.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index 6896d7212..5db7e0110 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -400,10 +400,8 @@ int ddxProcessArgument(int argc, char *argv[], int i)
}
if (!strcmp(argv[i], "-sync")) {
- if (++i < argc) {
- nxagentSynchronize = True;
- return 1;
- }
+ nxagentSynchronize = True;
+ return 1;
}
if (!strcmp(argv[i], "-full")) {