diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-28 12:14:22 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-28 12:14:22 +0200 |
| commit | 443b52723e9d790e3a619406bcd8b0dd32390dc3 (patch) | |
| tree | 3dc9faf4fe851d1d9a1c5062638cbd3874857163 /nxcomp | |
| parent | e1c85caacca67ea3d25319f2fe0a2985845bf1e9 (diff) | |
| parent | 64a83d1e08fd8224a065d6e3548be6323127d4df (diff) | |
| download | nx-libs-443b52723e9d790e3a619406bcd8b0dd32390dc3.tar.gz nx-libs-443b52723e9d790e3a619406bcd8b0dd32390dc3.tar.bz2 nx-libs-443b52723e9d790e3a619406bcd8b0dd32390dc3.zip | |
Merge branch 'Ionic-feature/reconnect-checks' into 3.6.x
Attributes GH PR #183: https://github.com/ArcticaProject/nx-libs/pull/183
Together with PR #143 this fixes ArcticaProject/nx-libs#132.
t merges an updated upstream into a topic branch.
Diffstat (limited to 'nxcomp')
| -rw-r--r-- | nxcomp/Loop.cpp | 3 | ||||
| -rw-r--r-- | nxcomp/Misc.cpp | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp index c0951ee19..10026967a 100644 --- a/nxcomp/Loop.cpp +++ b/nxcomp/Loop.cpp @@ -9063,7 +9063,8 @@ int ParseEnvironmentOptions(const char *env, int force) strcasecmp(name, "clipboard") == 0 || strcasecmp(name, "streaming") == 0 || strcasecmp(name, "backingstore") == 0 || - strcasecmp(name, "sleep") == 0) + strcasecmp(name, "sleep") == 0 || + strcasecmp(name, "tolerancechecks") == 0) { #ifdef DEBUG *logofs << "Loop: Ignoring agent option '" << name diff --git a/nxcomp/Misc.cpp b/nxcomp/Misc.cpp index ca062ebed..c94dc8b9c 100644 --- a/nxcomp/Misc.cpp +++ b/nxcomp/Misc.cpp @@ -325,7 +325,9 @@ shadowmode=s\n\ defer=n\n\ tile=s\n\ menu=n\n\ -sleep=n These options are interpreted by the NX agent. They\n\ +sleep=n\n\ +tolerancecehcks=s\n\ + These options are interpreted by the NX agent. They\n\ are ignored by the proxy.\n\ \n\ Environment:\n\ |