summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-11-14 15:19:12 (GMT)
committerBrad King <brad.king@kitware.com>2016-11-14 15:19:12 (GMT)
commit04dce5f9656e11954c6e2209d523c06ba95bb55e (patch)
treecc413305c69b382f71c14c3a5b890f8fd4aa3d46
parent7f0470cabc154b95f1ffb7553cf0dfb3a5b70b73 (diff)
parentd0a707b3d0c247d6bbf63fdfefc79d5ce0aea717 (diff)
downloadCMake-04dce5f9656e11954c6e2209d523c06ba95bb55e.zip
CMake-04dce5f9656e11954c6e2209d523c06ba95bb55e.tar.gz
CMake-04dce5f9656e11954c6e2209d523c06ba95bb55e.tar.bz2
Merge branch 'cmake-server-fix-16422' into release
-rw-r--r--Source/cmFileMonitor.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmFileMonitor.cxx b/Source/cmFileMonitor.cxx
index 41ec8b4..ea37683 100644
--- a/Source/cmFileMonitor.cxx
+++ b/Source/cmFileMonitor.cxx
@@ -288,7 +288,7 @@ void on_directory_change(uv_fs_event_t* handle, const char* filename,
{
const cmIBaseWatcher* const watcher =
static_cast<const cmIBaseWatcher*>(handle->data);
- const std::string pathSegment(filename);
+ const std::string pathSegment(filename ? filename : "");
watcher->Trigger(pathSegment, events, status);
}