--- s10k/XmlTools/xmlpatch.cpp	2017/10/05 17:48:32	1073
+++ s10k/XmlTools/xmlpatch.cpp	2019/02/16 17:25:06	1111
@@ -373,11 +373,6 @@ void XmlPatch::checkAndProcessValidComma
 
             command=GlobalVars::AppExecutable;
 
-            // Append files if forced to
-            if(!this->forceTargetFilesWildcard.isEmpty()){
-                command+=" --files '"+this->forceTargetFilesWildcard+"' ";
-            }
-
             command+=" "+getPatchParameterValue(line,"Options");
 
             // Add --no-backups and --no-verbose if patch was called with that arguments
@@ -392,6 +387,13 @@ void XmlPatch::checkAndProcessValidComma
             command.replace("'","\""); //replace apostrophe by quotes, to avoid problems
             command.replace("\"\"","'"); // this allow to use '' as ' ('' is transformed in "" and then in ')
 
+            // Append files if forced to
+
+            // This is added at the end so the apostrophe isn't done here (the path can contain it)
+            if(!this->forceTargetFilesWildcard.isEmpty()){
+                command+=" --files \""+this->forceTargetFilesWildcard+"\" ";
+            }
+
             executeCommandOperation(command);
 
             command.clear();