From: Adam Tkac <atkac@redhat.com>
Date: Wed, 7 Oct 2009 15:14:33 +0000 (+0000)
Subject: [Bugfix] Default -FullColor to 0 when -AutoSelect=0 and -LowColorLevel= are used.
X-Git-Tag: v1.0.90~381
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=21a5cc838eb74b3b3710db0078ef317f9a835c13;p=tigervnc.git

[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
---

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());