diff options
Diffstat (limited to 'RealtimeSync/xmlFreeFileSync.cpp')
| -rw-r--r-- | RealtimeSync/xmlFreeFileSync.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/RealtimeSync/xmlFreeFileSync.cpp b/RealtimeSync/xmlFreeFileSync.cpp index b3c11d50..dc352135 100644 --- a/RealtimeSync/xmlFreeFileSync.cpp +++ b/RealtimeSync/xmlFreeFileSync.cpp @@ -4,10 +4,13 @@ #include "../shared/zstring.h" #include "functions.h" #include "../shared/xmlBase.h" +#include "../shared/stringConv.h" //include FreeFileSync xml headers #include "../library/processXml.h" +using namespace FreeFileSync; + #ifdef FFS_WIN struct CmpNoCase @@ -31,20 +34,20 @@ xmlAccess::XmlRealConfig convertBatchToReal(const xmlAccess::XmlBatchConfig& bat #endif //add main folders - uniqueFolders.insert(batchCfg.mainCfg.mainFolderPair.leftDirectory.c_str()); - uniqueFolders.insert(batchCfg.mainCfg.mainFolderPair.rightDirectory.c_str()); + uniqueFolders.insert(zToWx(batchCfg.mainCfg.mainFolderPair.leftDirectory)); + uniqueFolders.insert(zToWx(batchCfg.mainCfg.mainFolderPair.rightDirectory)); //additional folders for (std::vector<FreeFileSync::FolderPairEnh>::const_iterator i = batchCfg.mainCfg.additionalPairs.begin(); i != batchCfg.mainCfg.additionalPairs.end(); ++i) { - uniqueFolders.insert(i->leftDirectory.c_str()); - uniqueFolders.insert(i->rightDirectory.c_str()); + uniqueFolders.insert(zToWx(i->leftDirectory)); + uniqueFolders.insert(zToWx(i->rightDirectory)); } output.directories.insert(output.directories.end(), uniqueFolders.begin(), uniqueFolders.end()); - output.commandline = FreeFileSync::getInstallationDir() + globalFunctions::FILE_NAME_SEPARATOR + wxT("FreeFileSync.exe ") + + output.commandline = FreeFileSync::getInstallationDir() + zToWx(globalFunctions::FILE_NAME_SEPARATOR) + wxT("FreeFileSync.exe ") + wxT("\"") + filename + wxT("\""); return output; |