Merge remote-tracking branch 'refs/remotes/origin/master' into file

Conflicts: src/FileManager.cpp
Jehops · Feb 25, 2015 · 359fa32 · 359fa32
2 parents 632f050 + 5f70420
commit 359fa32
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/FileManager.cpp b/src/FileManager.cpp
@@ -54,7 +54,8 @@ void FileManager::onRecurseJobFinished(const Set<Path> &paths)
     std::lock_guard<std::mutex> lock(mMutex); // ### is this needed now?
 
     std::shared_ptr<Project> project = mProject.lock();
-    assert(project);
+    if (!project)
+        return;
     Files &map = project->files();
     map.clear();
     mWatcher.clear();