diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2018-02-26 01:09:05 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-26 01:09:05 +0100 |
| commit | 164263e1a12fc8a3a496739799cb60d547857f0a (patch) | |
| tree | f94c76301d393c9e232a0d7d3f6d6f43373f8c56 /nxcomp | |
| parent | 05152b788ab184f45df1f64182791c88a09dc6f9 (diff) | |
| parent | 8d00456ad3e7b7a49d8fadb269334589e3704758 (diff) | |
| download | nx-libs-164263e1a12fc8a3a496739799cb60d547857f0a.tar.gz nx-libs-164263e1a12fc8a3a496739799cb60d547857f0a.tar.bz2 nx-libs-164263e1a12fc8a3a496739799cb60d547857f0a.zip | |
Merge branch 'sunweaver-pr/nomagicpixel' into 3.6.x
Attributes GH PR #658: https://github.com/ArcticaProject/nx-libs/pull/658
Fixes: ArcticaProject/nx-libs#657
Diffstat (limited to 'nxcomp')
| -rw-r--r-- | nxcomp/src/Loop.cpp | 3 | ||||
| -rw-r--r-- | nxcomp/src/Misc.cpp | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp index 754c55c96..4862748e0 100644 --- a/nxcomp/src/Loop.cpp +++ b/nxcomp/src/Loop.cpp @@ -8474,7 +8474,8 @@ int ParseEnvironmentOptions(const char *env, int force) else if (strcasecmp(name, "defer") == 0 || strcasecmp(name, "tile") == 0 || strcasecmp(name, "menu") == 0 || - strcasecmp(name, "state") == 0 ) + strcasecmp(name, "magicpixel") == 0 || + strcasecmp(name, "state") == 0 ) { nxdbg << "Loop: Ignoring agent option '" << name << "' with value '" << value << "'.\n" diff --git a/nxcomp/src/Misc.cpp b/nxcomp/src/Misc.cpp index 7e468f1e2..b6bf24578 100644 --- a/nxcomp/src/Misc.cpp +++ b/nxcomp/src/Misc.cpp @@ -343,6 +343,7 @@ shadowmode=s\n\ defer=n\n\ tile=s\n\ menu=n\n\ +magicpixel=n\n\ sleep=n\n\ tolerancechecks=s\n\ keyconv=s\n\ |