mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 01:54:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'develop' into fix-log-level-bleed

Browse source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad 2025-12-08 09:21:27 +00:00 • committed by GitHub
commit 4f5e348b66
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
35 changed files with 135 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

8
launcher/launch/LaunchTask.cpp
View file

@ -214,7 +214,7 @@ shared_qobject_ptr<LogModel> LaunchTask::getLogModel()
return m_logModel;
}
bool LaunchTask::parseXmlLogs(QString const& line, MessageLevel::Enum level)
bool LaunchTask::parseXmlLogs(QString const& line, MessageLevel level)
{
LogParser* parser;
switch (level) {
@ -254,7 +254,7 @@ bool LaunchTask::parseXmlLogs(QString const& line, MessageLevel::Enum level)
} else if (std::holds_alternative<LogParser::PlainText>(item)) {
auto msg = std::get<LogParser::PlainText>(item).message;
MessageLevel::Enum newLevel = MessageLevel::fromLine(msg);
MessageLevel newLevel = messageLevelFromLine(msg);
if (newLevel == MessageLevel::Unknown)
newLevel = LogParser::guessLevel(line, model->previousLevel());
@ -268,14 +268,14 @@ bool LaunchTask::parseXmlLogs(QString const& line, MessageLevel::Enum level)
return true;
}
void LaunchTask::onLogLines(const QStringList& lines, MessageLevel::Enum defaultLevel)
void LaunchTask::onLogLines(const QStringList& lines, MessageLevel defaultLevel)
{
for (auto& line : lines) {
onLogLine(line, defaultLevel);
}
}
void LaunchTask::onLogLine(QString line, MessageLevel::Enum level)
void LaunchTask::onLogLine(QString line, MessageLevel level)
{
if (parseXmlLogs(line, level)) {
return;