Only log error when setting FullScreenSelectedMonitors

We don't want the log to spam every time this parameter is used so only
complain from the parses when the value is changed.

diff --git a/vncviewer/MonitorIndicesParameter.cxx b/vncviewer/MonitorIndicesParameter.cxx
index 651d636b2cdc4b937f841628839fe950ab7696ec..b3ee4b19450f115a17d154b9c92a9ad329f62c9e 100644 (file)
--- a/vncviewer/MonitorIndicesParameter.cxx
+++ b/vncviewer/MonitorIndicesParameter.cxx
@@ -74,7 +74,7 @@ bool MonitorIndicesParameter::setParam(const char* value)
     if (strlen(value) < 0)
         return false;
 
-    if (!parseIndices(value, &indices)) {
+    if (!parseIndices(value, &indices, true)) {
         vlog.error(_("Invalid configuration specified for %s"), name);
         return false;
     }
@@ -134,21 +134,19 @@ static bool parseNumber(std::string number, std::set<int> *indices)
 
     int v = strtol(number.c_str(), NULL, 0);
 
-    if (v <= 0) {
-        vlog.error(_("The given monitor index(%s) is too small to be valid"), number.c_str());
+    if (v <= 0)
         return false;
-    }
 
-    if (v > INT_MAX) {
-        vlog.error(_("The given monitor index (%s) is too large to be valid"), number.c_str());
+    if (v > INT_MAX)
         return false;
-    }
 
     indices->insert(v-1);
     return true;
 }
 
-bool MonitorIndicesParameter::parseIndices(const char* value, std::set<int> *indices)
+bool MonitorIndicesParameter::parseIndices(const char* value,
+                                           std::set<int> *indices,
+                                           bool complain)
 {
     char d;
     std::string current;
@@ -162,13 +160,16 @@ bool MonitorIndicesParameter::parseIndices(const char* value, std::set<int> *ind
             current.push_back(d);
         else if (d == ',') {
             if (!parseNumber(current, indices)) {
-                vlog.error(_("Invalid monitor index '%s'"), current.c_str());
+                if (complain)
+                    vlog.error(_("Invalid monitor index '%s'"),
+                               current.c_str());
                 return false;
             }
 
             current.clear();
         } else {
-            vlog.error(_("Unexpected character '%c'"), d);
+            if (complain)
+                vlog.error(_("Unexpected character '%c'"), d);
             return false;
         }
     }
@@ -178,8 +179,12 @@ bool MonitorIndicesParameter::parseIndices(const char* value, std::set<int> *ind
         return true;
 
     // Parsing anything we have left.
-    if (!parseNumber(current, indices))
+    if (!parseNumber(current, indices)) {
+        if (complain)
+            vlog.error(_("Invalid monitor index '%s'"),
+                       current.c_str());
         return false;
+    }
 
     return true;
 }

diff --git a/vncviewer/MonitorIndicesParameter.h b/vncviewer/MonitorIndicesParameter.h
index 1e0925d2988a59d47f8a7c56d65ad4b33365a65b..58e55e438ef35541ab0381e2c0105a6ab5d1bc7f 100644 (file)
--- a/vncviewer/MonitorIndicesParameter.h
+++ b/vncviewer/MonitorIndicesParameter.h
@@ -36,7 +36,8 @@ private:
         int fltkIndex;
     } Monitor;
 
-    bool parseIndices(const char* value, std::set<int> *indices);
+    bool parseIndices(const char* value, std::set<int> *indices,
+                      bool complain=false);
     std::vector<MonitorIndicesParameter::Monitor> fetchMonitors();
     static int compare(const void*, const void*);
 };