diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-18 09:27:39 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-18 09:27:39 +0200 |
| commit | 2dd1a1fe6dbbffd764ea0a36743ec7d8e83b2ad6 (patch) | |
| tree | bc82daeb0090eea8dc7eb977cc82a3ed47284262 /nxcomp/Loop.cpp | |
| parent | 3dea5a88cad4ee51b2240bb95693ccb4c43047b5 (diff) | |
| parent | 6051dec4a1ae6decd9123a3310098baf43f45c49 (diff) | |
| download | nx-libs-2dd1a1fe6dbbffd764ea0a36743ec7d8e83b2ad6.tar.gz nx-libs-2dd1a1fe6dbbffd764ea0a36743ec7d8e83b2ad6.tar.bz2 nx-libs-2dd1a1fe6dbbffd764ea0a36743ec7d8e83b2ad6.zip | |
Merge branch 'Ionic-feature/configurablesleep' into 3.6.x
Attributes GH PR #143: https://github.com/ArcticaProject/nx-libs/pull/143
Diffstat (limited to 'nxcomp/Loop.cpp')
| -rw-r--r-- | nxcomp/Loop.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp index 473488593..5086db012 100644 --- a/nxcomp/Loop.cpp +++ b/nxcomp/Loop.cpp @@ -9003,7 +9003,8 @@ int ParseEnvironmentOptions(const char *env, int force) strcasecmp(name, "keyboard") == 0 || strcasecmp(name, "clipboard") == 0 || strcasecmp(name, "streaming") == 0 || - strcasecmp(name, "backingstore") == 0) + strcasecmp(name, "backingstore") == 0 || + strcasecmp(name, "sleep") == 0) { #ifdef DEBUG *logofs << "Loop: Ignoring agent option '" << name |