[Bugfix] Default -FullColor to 0 when -AutoSelect=0 and -LowColorLevel= are used.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1_0@3909 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/unix/vncviewer/vncviewer.cxx b/unix/vncviewer/vncviewer.cxx
index 4a47788ea5b0ca063dbba66ec4f09564081d47e3..5a4ee37d59ff7e610ded2e198eb0d071089b82c3 100644 (file)
--- 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());