summaryrefslogtreecommitdiffstats
path: root/logic/minecraft
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-08-19 02:04:56 +0200
committerPetr Mrázek <peterix@gmail.com>2015-08-19 02:04:56 +0200
commit5bc29b06a9268a43fe13a627ac02f34a77c76895 (patch)
treeeef34c5d98f7f588d18a547b0c8aff6408e8e3a5 /logic/minecraft
parent96fdaebb5c8c8902c98c1fb43e755cf90fc15198 (diff)
downloadMultiMC-5bc29b06a9268a43fe13a627ac02f34a77c76895.tar
MultiMC-5bc29b06a9268a43fe13a627ac02f34a77c76895.tar.gz
MultiMC-5bc29b06a9268a43fe13a627ac02f34a77c76895.tar.lz
MultiMC-5bc29b06a9268a43fe13a627ac02f34a77c76895.tar.xz
MultiMC-5bc29b06a9268a43fe13a627ac02f34a77c76895.zip
NOISSUE fix log-related legacy instance crash and show hidden log files
Diffstat (limited to 'logic/minecraft')
-rw-r--r--logic/minecraft/MinecraftInstance.cpp7
-rw-r--r--logic/minecraft/MinecraftInstance.h2
2 files changed, 9 insertions, 0 deletions
diff --git a/logic/minecraft/MinecraftInstance.cpp b/logic/minecraft/MinecraftInstance.cpp
index 50962452..c3d73456 100644
--- a/logic/minecraft/MinecraftInstance.cpp
+++ b/logic/minecraft/MinecraftInstance.cpp
@@ -284,7 +284,14 @@ IPathMatcher::Ptr MinecraftInstance::getLogFileMatcher()
auto combined = std::make_shared<MultiMatcher>();
combined->add(std::make_shared<RegexpMatcher>(".*\\.log(\\.[0-9]*)?(\\.gz)?$"));
combined->add(std::make_shared<RegexpMatcher>("crash-.*\\.txt"));
+ combined->add(std::make_shared<RegexpMatcher>("IDMap dump.*\\.txt$"));
+ combined->add(std::make_shared<RegexpMatcher>("ModLoader\\.txt(\\..*)?$"));
return combined;
}
+QString MinecraftInstance::getLogFileRoot()
+{
+ return minecraftRoot();
+}
+
#include "MinecraftInstance.moc"
diff --git a/logic/minecraft/MinecraftInstance.h b/logic/minecraft/MinecraftInstance.h
index a09e44db..39a51b9a 100644
--- a/logic/minecraft/MinecraftInstance.h
+++ b/logic/minecraft/MinecraftInstance.h
@@ -46,6 +46,8 @@ public:
virtual IPathMatcher::Ptr getLogFileMatcher() override;
+ virtual QString getLogFileRoot() override;
+
protected:
QMap<QString, QString> createCensorFilterFromSession(AuthSessionPtr session);
};