summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/crsm.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/crsm.cpp b/src/crsm.cpp
index 9e4d887..40d328e 100644
--- a/src/crsm.cpp
+++ b/src/crsm.cpp
@@ -781,7 +781,7 @@ void CRSM::listC4Folders()
{
if(it.fileName() == ".." || it.fileName() == ".")
continue;
- if((it.fileInfo().suffix() == "c4f" || (it.fileInfo().isDir() && !QDir(it.fileInfo().absoluteFilePath()).entryList(QStringList() << "*.c4f" << "*.c4s").isEmpty())) && it.fileName() != "." && it.fileName() != ".." && !Config.Clonk.Server.IgnoreFolders.contains(it.fileInfo().baseName()))
+ if((it.fileInfo().suffix() == "c4f" || (it.fileInfo().isDir() && !QDir(it.fileInfo().absoluteFilePath()).entryList(QStringList() << "*.c4f" << "*.c4s").isEmpty())) && it.fileName() != "." && it.fileName() != ".." && !Config.Clonk.Server.IgnoreFolders.contains(it.fileInfo().fileName()))
{
QFileInfo listInfo(Config.CRSM.ListFolder + it.fileName() + ".lst");
if(listInfo.exists() && it.fileInfo().exists() && it.fileInfo().lastModified() < listInfo.lastModified()) continue;
@@ -903,7 +903,7 @@ QString CRSM::listScenarios(QString commandArgs)
QDirIterator folderIt(Config.CRSM.ListFolder, QDirIterator::FollowSymlinks);
for(; folderIt.hasNext(); folderIt.next())
{
- if(folderIt.fileInfo().suffix() == "lst" && !Config.Clonk.Server.IgnoreFolders.contains(folderIt.fileInfo().baseName()))
+ if(folderIt.fileInfo().suffix() == "lst" && !Config.Clonk.Server.IgnoreFolders.contains(folderIt.fileInfo().completeBaseName()))
ret += " " + folderIt.fileInfo().completeBaseName() + "\n";
}
}
@@ -918,7 +918,7 @@ QString CRSM::listScenarios(QString commandArgs)
else
{
QFile file(Config.CRSM.ListFolder + commandArgs + ".lst");
- if(file.exists())
+ if(file.exists() && !Config.Clonk.Server.IgnoreFolders.contains(QFileInfo(file).completeBaseName()))
{
ret += "Der Ordner \"" + commandArgs + QString("\" enthält folgende Szenarien:\n");
file.open(QFile::ReadOnly);