diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:09:02 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:09:02 +0200 |
| commit | 62490fd57f403da83fc5dd6e5ec2f3fcfa8c47cb (patch) | |
| tree | 8485ba5ea0f88050714350dfbdc13486037cdb2e /RealtimeSync | |
| parent | 3.10 (diff) | |
| download | FreeFileSync-62490fd57f403da83fc5dd6e5ec2f3fcfa8c47cb.tar.gz FreeFileSync-62490fd57f403da83fc5dd6e5ec2f3fcfa8c47cb.tar.bz2 FreeFileSync-62490fd57f403da83fc5dd6e5ec2f3fcfa8c47cb.zip | |
3.11
Diffstat (limited to 'RealtimeSync')
| -rw-r--r-- | RealtimeSync/main_dlg.cpp | 2 | ||||
| -rw-r--r-- | RealtimeSync/watcher.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/RealtimeSync/main_dlg.cpp b/RealtimeSync/main_dlg.cpp index 447f1f01..3f22dcc3 100644 --- a/RealtimeSync/main_dlg.cpp +++ b/RealtimeSync/main_dlg.cpp @@ -339,7 +339,7 @@ void MainDialog::OnRemoveTopFolder(wxCommandEvent& event) { if (dirNamesExtra.size() > 0) { - const wxString topDir = (*dirNamesExtra.begin())->getName().c_str(); + const wxString topDir = zToWx((*dirNamesExtra.begin())->getName()); dirNameFirst->setName(wxToZ(topDir)); diff --git a/RealtimeSync/watcher.cpp b/RealtimeSync/watcher.cpp index cf2791ad..e9793545 100644 --- a/RealtimeSync/watcher.cpp +++ b/RealtimeSync/watcher.cpp @@ -64,7 +64,7 @@ public: virtual ReturnValDir onDir(const Zchar* shortName, const Zstring& fullName) { m_dirs.push_back(fullName.c_str()); - return ReturnValDir(Loki::Int2Type<ReturnValDir::TRAVERSING_DIR_CONTINUE>(), this); + return ReturnValDir(Loki::Int2Type<ReturnValDir::TRAVERSING_DIR_CONTINUE>(), *this); } virtual void onError(const wxString& errorText) { @@ -247,7 +247,7 @@ rts::WaitResult rts::waitForChanges(const std::vector<Zstring>& dirNames, WaitCa try //get all subdirectories { DirsOnlyTraverser traverser(fullDirList); - ffs3::traverseFolder(formattedDir, false, &traverser); //don't traverse into symlinks (analog to windows build) + ffs3::traverseFolder(formattedDir, false, traverser); //don't traverse into symlinks (analog to windows build) } catch (const ffs3::FileError&) { |