summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorAdam Tkac <atkac@redhat.com>2009-10-07 15:14:33 +0000
committerAdam Tkac <atkac@redhat.com>2009-10-07 15:14:33 +0000
commit21a5cc838eb74b3b3710db0078ef317f9a835c13 (patch)
tree062c3e4e93bae1219cf470f0063b26a850354401 /unix
parent4227fd9f751121733efa1292ad480c263f00087d (diff)
downloadtigervnc-21a5cc838eb74b3b3710db0078ef317f9a835c13.tar.gz
tigervnc-21a5cc838eb74b3b3710db0078ef317f9a835c13.zip
[Bugfix] Default -FullColor to 0 when -AutoSelect=0 and -LowColorLevel= are used.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3906 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'unix')
-rw-r--r--unix/vncviewer/vncviewer.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/unix/vncviewer/vncviewer.cxx b/unix/vncviewer/vncviewer.cxx
index 4a47788e..5a4ee37d 100644
--- a/unix/vncviewer/vncviewer.cxx
+++ b/unix/vncviewer/vncviewer.cxx
@@ -337,6 +337,13 @@ int main(int argc, char** argv)
&& !::fullColour.hasBeenSet()
&& !::fullColourAlias.hasBeenSet());
}
+ if (!::fullColour.hasBeenSet() && !::fullColourAlias.hasBeenSet()) {
+ // Default to FullColor=0 if AutoSelect=0 && LowColorLevel is set
+ if (!::autoSelect && (::lowColourLevel.hasBeenSet() ||
+ ::lowColourLevelAlias.hasBeenSet())) {
+ ::fullColour.setParam(false);
+ }
+ }
if (!::customCompressLevel.hasBeenSet()) {
// Default to CustomCompressLevel=1 if CompressLevel is used.
::customCompressLevel.setParam(::compressLevel.hasBeenSet());