Load the local .cquery in all cases that it is present

jacobdufault · Jun 20, 2018 · 4bbba0b · 4bbba0b
1 parent 1acc50f
commit 4bbba0b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/project.cc b/src/project.cc
@@ -466,10 +466,10 @@ std::vector<Project::Entry> LoadFromDirectoryListing(
 
   GetFilesInFolder(
       config->project_dir, true /*recursive*/, true /*add_folder_to_path*/,
-      [&folder_args, &files, &use_global_config](const std::string& path) {
+      [&folder_args, &files](const std::string& path) {
         if (SourceFileLanguage(path) != LanguageId::Unknown) {
           files.push_back(path);
-        } else if (GetBaseName(path) == ".cquery" && !use_global_config) {
+        } else if (GetBaseName(path) == ".cquery") {
           LOG_S(INFO) << "Using .cquery arguments from " << path;
           folder_args.emplace(GetDirName(path),
                               ReadCompilerArgumentsFromFile(path));