fix bug in fs-watcher; file was never deleted from Files database when the parent dir still exists
Change-Id: I051f27de54b7f08c14253cfe250f603ee6d4be6b
diff --git a/fs-watcher/fs-watcher.cc b/fs-watcher/fs-watcher.cc
index cfb7f55..20f486c 100644
--- a/fs-watcher/fs-watcher.cc
+++ b/fs-watcher/fs-watcher.cc
@@ -128,6 +128,7 @@
_LOG_DEBUG ("Triggered DELETE of file: " << triggeredFile.relative_path ().generic_string ());
// m_onDelete (triggeredFile.relative_path ());
+ deleteFile(triggeredFile.relative_path());
Scheduler::scheduleOneTimeTask (m_scheduler, 0.5,
bind (m_onDelete, triggeredFile.relative_path ()),
"r-" + triggeredFile.relative_path ().string());
diff --git a/src/dispatcher.cc b/src/dispatcher.cc
index f4cf57d..3d3324b 100644
--- a/src/dispatcher.cc
+++ b/src/dispatcher.cc
@@ -253,13 +253,6 @@
return;
}
- FileItemPtr currentFile = m_fileState->LookupFile (relativeFilePath.generic_string ());
- if (!currentFile)
- {
- _LOG_ERROR ("File already deleted [" << relativeFilePath << "]");
- return;
- }
-
m_actionLog->AddLocalActionDelete (relativeFilePath.generic_string());
// notify SyncCore to propagate the change
m_core->localStateChangedDelayed();