瀏覽代碼

Merge branch '307-cli-empty-string-not-rejected'

Re-closes #307.
Matt Clarkson 12 年之前
父節點
當前提交
6f0028c682
共有 1 個文件被更改,包括 5 次插入7 次删除
  1. 5 7
      Libs/CommandLineModules/Backend/LocalProcess/ctkCmdLineModuleBackendLocalProcess.cpp

+ 5 - 7
Libs/CommandLineModules/Backend/LocalProcess/ctkCmdLineModuleBackendLocalProcess.cpp

@@ -94,14 +94,11 @@ struct ctkCmdLineModuleBackendLocalProcessPrivate
           {
             foreach(QString arg, args)
             {
-
-              QString trimmedArg = arg.trimmed();
-
               if (parameter.tag() == "string")
               {
-                if (trimmedArg.length() != 0)
+                if (arg.length() != 0)
                 {
-                  cmdLineArgs << argFlag << trimmedArg;
+                  cmdLineArgs << argFlag << arg;
                 }
                 else
                 {
@@ -110,9 +107,10 @@ struct ctkCmdLineModuleBackendLocalProcessPrivate
               }
               else
               {
-                if (trimmedArg.length() != 0) // If not string, no arg, we don't output. We need this policy for integers, doubles, etc.
+                QString trimmedArg = arg.trimmed();
+                if (trimmedArg.length() != 0) // If not string, and no arg, we don't output. We need this policy for integers, doubles, etc.
                 {
-                  cmdLineArgs << argFlag << arg;
+                  cmdLineArgs << argFlag << trimmedArg;
                 }
               }
             } // end foreach