[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loolwsd/LOOLWSD.cpp

[Andras Timar]

 loolwsd/LOOLWSD.cpp |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 61aba974a9e5ef108da2d37080e7d6b05eab0d2b
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun Jul 3 16:43:36 2016 +0200

    loolwsd: command line config override should work in non-debug builds as well ;)
    
    (cherry picked from commit 801c8f46761f88e66e9dafdd8ff7daa7a9ab8fb2)

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 1969ad0..b9bd1e1 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1375,13 +1375,6 @@ void LOOLWSD::handleOption(const std::string& optionName,
         DisplayVersion = true;
     else if (optionName == "port")
         ClientPortNumber = std::stoi(value);
-#if ENABLE_DEBUG
-    else if (optionName == "unitlib")
-        UnitTestLibrary = value;
-    else if (optionName == "nocaps")
-        NoCapsForKit = true;
-    else if (optionName == "careerspan")
-        careerSpanSeconds = std::stoi(value);
     else if (optionName == "override")
     {
         std::string optName;
@@ -1389,6 +1382,13 @@ void LOOLWSD::handleOption(const std::string& optionName,
         LOOLProtocol::parseNameValuePair(value, optName, optValue);
         _overrideSettings[optName] = optValue;
     }
+#if ENABLE_DEBUG
+    else if (optionName == "unitlib")
+        UnitTestLibrary = value;
+    else if (optionName == "nocaps")
+        NoCapsForKit = true;
+    else if (optionName == "careerspan")
+        careerSpanSeconds = std::stoi(value);
 
     static const char* clientPort = getenv("LOOL_TEST_CLIENT_PORT");
     if (clientPort)