Merge branch 'uli42-pr/fix_sync_segfault' into 3.6.x

Attributes GH PR #466: https://github.com/ArcticaProject/nx-libs/pull/466

Merge branch 'uli42-pr/fix_sync_segfault' into 3.6.x
4f216e7c · Mike Gabriel · 7fd59fbd · 19116a61 · 4f216e7c
Unverified Commit 4f216e7c authored Jun 11, 2017 by Mike Gabriel
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

Args.c nx-X11/programs/Xserver/hw/nxagent/Args.c +2 -4

No files found.
--- 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")) {