diff --git a/NEWS.md b/NEWS.md
index b9f920fc..0d699ad1 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -13,6 +13,7 @@ Red Panda C++ Version 2.6
   - enhancement: Show current problem's description in the problem list's mouse tip.
   - enhancement: Show memory usage for problem cases (windows only).
   - enhancement: Show memory usage after console program exited.
+  - fix: If clang and g++ are in the same folder, only the compiler sets for gcc are auto generated.
 
 Red Panda C++ Version 2.5
 
diff --git a/RedPandaIDE/settings.cpp b/RedPandaIDE/settings.cpp
index a871b471..88943cb7 100644
--- a/RedPandaIDE/settings.cpp
+++ b/RedPandaIDE/settings.cpp
@@ -1557,7 +1557,7 @@ Settings::CompilerSet::CompilerSet():
 }
 
 
-Settings::CompilerSet::CompilerSet(const QString& compilerFolder, const QString& cc_prog):
+Settings::CompilerSet::CompilerSet(const QString& compilerFolder, const QString& c_prog):
     mAutoAddCharsetParams(true),
     mExecCharset(ENCODING_SYSTEM_DEFAULT),
     mStaticLink(true),
@@ -1568,7 +1568,7 @@ Settings::CompilerSet::CompilerSet(const QString& compilerFolder, const QString&
     mCompilationStage(Settings::CompilerSet::CompilationStage::GenerateExecutable)
 {
     if (QDir(compilerFolder).exists()) {
-        setProperties(compilerFolder, cc_prog);
+        setProperties(compilerFolder, c_prog);
 
         //manually set the directories
         setDirectories(compilerFolder, mCompilerType);
@@ -2051,21 +2051,15 @@ static void addExistingDirectory(QStringList& dirs, const QString& directory) {
     dirs.append(dirPath);
 }
 
-void Settings::CompilerSet::setProperties(const QString &binDir, const QString& cc_prog)
+void Settings::CompilerSet::setProperties(const QString &binDir, const QString& c_prog)
 {
-    if (cc_prog.isEmpty())
+    if (c_prog.isEmpty())
         return;
-//    QString cc_prog;
-//    if (fileExists(binDir, CLANG_PROGRAM))
-//        cc_prog = CLANG_PROGRAM;
-//    else  if (fileExists(binDir,GCC_PROGRAM))
-//        cc_prog = GCC_PROGRAM;
-//    else
-//        return;
+
     // Obtain version number and compiler distro etc
     QStringList arguments;
     arguments.append("-v");
-    QByteArray output = getCompilerOutput(binDir,cc_prog,arguments);
+    QByteArray output = getCompilerOutput(binDir,c_prog,arguments);
 
     //Target
     QByteArray targetStr = "Target: ";
@@ -2169,7 +2163,7 @@ void Settings::CompilerSet::setProperties(const QString &binDir, const QString&
     // Obtain compiler target
     arguments.clear();
     arguments.append("-dumpmachine");
-    mDumpMachine = getCompilerOutput(binDir, cc_prog, arguments);
+    mDumpMachine = getCompilerOutput(binDir, c_prog, arguments);
 
     // Add the default directories
     addExistingDirectory(mBinDirs, includeTrailingPathDelimiter(folder) +  "bin");
@@ -2257,11 +2251,11 @@ void Settings::CompilerSet::setExecutables()
 void Settings::CompilerSet::setDirectories(const QString& binDir,CompilerType compilerType)
 {
     QString folder = QFileInfo(binDir).absolutePath();
-    QString cc_prog;
+    QString c_prog;
     if (compilerType==CompilerType::Clang)
-        cc_prog = CLANG_PROGRAM;
+        c_prog = CLANG_PROGRAM;
     else
-        cc_prog = GCC_PROGRAM;
+        c_prog = GCC_PROGRAM;
     // Find default directories
     // C include dirs
     QStringList arguments;
@@ -2270,7 +2264,7 @@ void Settings::CompilerSet::setDirectories(const QString& binDir,CompilerType co
     arguments.append("-v");
     arguments.append("-E");
     arguments.append(NULL_FILE);
-    QByteArray output = getCompilerOutput(binDir,cc_prog,arguments);
+    QByteArray output = getCompilerOutput(binDir,c_prog,arguments);
 
     int delimPos1 = output.indexOf("#include <...> search starts here:");
     int delimPos2 = output.indexOf("End of search list.");
@@ -2292,7 +2286,7 @@ void Settings::CompilerSet::setDirectories(const QString& binDir,CompilerType co
     arguments.append("-E");
     arguments.append("-v");
     arguments.append(NULL_FILE);
-    output = getCompilerOutput(binDir,cc_prog,arguments);
+    output = getCompilerOutput(binDir,c_prog,arguments);
     //gcc -xc++ -E -v NUL
 
     delimPos1 = output.indexOf("#include <...> search starts here:");
@@ -2312,7 +2306,7 @@ void Settings::CompilerSet::setDirectories(const QString& binDir,CompilerType co
     arguments.clear();
     arguments.append("-print-search-dirs");
     arguments.append(NULL_FILE);
-    output = getCompilerOutput(binDir,cc_prog,arguments);
+    output = getCompilerOutput(binDir,c_prog,arguments);
     // bin dirs
     QByteArray targetStr = QByteArray("programs: =");
     delimPos1 = output.indexOf(targetStr);
@@ -2608,10 +2602,10 @@ Settings::PCompilerSet Settings::CompilerSets::addSet()
     return p;
 }
 
-Settings::PCompilerSet Settings::CompilerSets::addSet(const QString &folder, const QString& cc_prog)
+Settings::PCompilerSet Settings::CompilerSets::addSet(const QString &folder, const QString& c_prog)
 {
-    PCompilerSet p=std::make_shared<CompilerSet>(folder,cc_prog);
-    if (cc_prog==GCC_PROGRAM && p->compilerType()==CompilerType::Clang)
+    PCompilerSet p=std::make_shared<CompilerSet>(folder,c_prog);
+    if (c_prog==GCC_PROGRAM && p->compilerType()==CompilerType::Clang)
         return PCompilerSet();
     mList.push_back(p);
     return p;
@@ -2651,15 +2645,13 @@ static void setDebugOptions(Settings::PCompilerSet pSet) {
     pSet->setStaticLink(false);
 }
 
-bool Settings::CompilerSets::addSets(const QString &folder, const QString& cc_prog) {
+bool Settings::CompilerSets::addSets(const QString &folder, const QString& c_prog) {
     foreach (const PCompilerSet& set, mList) {
-        if (set->binDirs().contains(folder)) {
-            if (extractFileName(set->cppCompiler())==cc_prog)
-                return false;
-        }
+        if (set->binDirs().contains(folder) && extractFileName(set->CCompiler())==c_prog)
+            return false;
     }
     // Default, release profile
-    PCompilerSet baseSet = addSet(folder,cc_prog);
+    PCompilerSet baseSet = addSet(folder,c_prog);
     if (!baseSet)
         return false;
     QString baseName = baseSet->name();
diff --git a/RedPandaIDE/settings.h b/RedPandaIDE/settings.h
index e25dbff9..332a3a27 100644
--- a/RedPandaIDE/settings.h
+++ b/RedPandaIDE/settings.h
@@ -1230,14 +1230,14 @@ public:
         };
 
         explicit CompilerSet();
-        explicit CompilerSet(const QString& compilerFolder, const QString& cc_prog);
+        explicit CompilerSet(const QString& compilerFolder, const QString& c_prog);
         explicit CompilerSet(const CompilerSet& set);
 
         CompilerSet& operator= (const CompilerSet& ) = delete;
         CompilerSet& operator= (const CompilerSet&& ) = delete;
 
         // Initialization
-        void setProperties(const QString& binDir, const QString& cc_prog);
+        void setProperties(const QString& binDir, const QString& c_prog);
 
         void resetCompileOptionts();
         bool setCompileOption(const QString& key, int valIndex);
@@ -1425,9 +1425,9 @@ public:
         QString getKeyFromCompilerCompatibleIndex(int idx) const;
 
     private:
-        PCompilerSet addSet(const QString& folder, const QString& cc_prog);
+        PCompilerSet addSet(const QString& folder, const QString& c_prog);
         PCompilerSet addSet(const PCompilerSet &pSet);
-        bool addSets(const QString& folder, const QString& cc_prog);
+        bool addSets(const QString& folder, const QString& c_prog);
         void savePath(const QString& name, const QString& path);
         void savePathList(const QString& name, const QStringList& pathList);