summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-01-12 15:20:21 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2017-01-12 15:20:21 (GMT)
commitc9a0b14153b87de34a651b1136971f9404fc362c (patch)
tree3f0664cd2e65a3eee511d2b77dcba4ed2df65baa
parent053adc60ee80e55f2a8c09fadadc5db6e789412d (diff)
parent7bad99b0d3fb50853937d99cd68eb340a0975156 (diff)
downloadCMake-c9a0b14153b87de34a651b1136971f9404fc362c.zip
CMake-c9a0b14153b87de34a651b1136971f9404fc362c.tar.gz
CMake-c9a0b14153b87de34a651b1136971f9404fc362c.tar.bz2
Merge topic 'cmFileMonitor-skip-empty-names'
7bad99b0 cmake-server: Do not try watching subdirectories with empty names
-rw-r--r--Source/cmFileMonitor.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmFileMonitor.cxx b/Source/cmFileMonitor.cxx
index 03bbf42..909be78 100644
--- a/Source/cmFileMonitor.cxx
+++ b/Source/cmFileMonitor.cxx
@@ -334,6 +334,9 @@ void cmFileMonitor::MonitorPaths(const std::vector<std::string>& paths,
rootSegment)); // Can not be both filename and root part of the path!
const std::string& currentSegment = pathSegments[i];
+ if (currentSegment.empty()) {
+ continue;
+ }
cmIBaseWatcher* nextWatcher = currentWatcher->Find(currentSegment);
if (!nextWatcher) {