From 87dd9515052661e622587cafcf972ea1beee8195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Fri, 4 Nov 2016 01:17:28 +0100 Subject: NOISSUE add a badge for crashed instances Not persistent across MultiMC runs. --- api/logic/minecraft/MinecraftInstance.cpp | 8 +++----- api/logic/minecraft/onesix/OneSixInstance.cpp | 10 +--------- api/logic/minecraft/onesix/update/LibrariesTask.cpp | 2 +- 3 files changed, 5 insertions(+), 15 deletions(-) (limited to 'api/logic/minecraft') diff --git a/api/logic/minecraft/MinecraftInstance.cpp b/api/logic/minecraft/MinecraftInstance.cpp index d3af5011..f0d47733 100644 --- a/api/logic/minecraft/MinecraftInstance.cpp +++ b/api/logic/minecraft/MinecraftInstance.cpp @@ -369,7 +369,7 @@ QString MinecraftInstance::prettifyTimeDuration(int64_t duration) QString MinecraftInstance::getStatusbarDescription() { QStringList traits; - if (flags() & VersionBrokenFlag) + if (hasVersionBroken()) { traits.append(tr("broken")); } @@ -380,12 +380,10 @@ QString MinecraftInstance::getStatusbarDescription() { description.append(tr(", played for %1").arg(prettifyTimeDuration(totalTimePlayed()))); } - /* - if(traits.size()) + if(hasCrashed()) { - description.append(QString(" (%1)").arg(traits.join(", "))); + description.append(tr(", has crashed.")); } - */ return description; } diff --git a/api/logic/minecraft/onesix/OneSixInstance.cpp b/api/logic/minecraft/onesix/OneSixInstance.cpp index d89a7612..859e2e69 100644 --- a/api/logic/minecraft/onesix/OneSixInstance.cpp +++ b/api/logic/minecraft/onesix/OneSixInstance.cpp @@ -526,15 +526,7 @@ QString OneSixInstance::currentVersionId() const void OneSixInstance::reloadProfile() { m_profile->reload(); - auto severity = m_profile->getProblemSeverity(); - if(severity == ProblemSeverity::PROBLEM_ERROR) - { - setFlag(VersionBrokenFlag); - } - else - { - unsetFlag(VersionBrokenFlag); - } + setVersionBroken(m_profile->getProblemSeverity() == ProblemSeverity::PROBLEM_ERROR); emit versionReloaded(); } diff --git a/api/logic/minecraft/onesix/update/LibrariesTask.cpp b/api/logic/minecraft/onesix/update/LibrariesTask.cpp index 1efbc64c..f60c2b5e 100644 --- a/api/logic/minecraft/onesix/update/LibrariesTask.cpp +++ b/api/logic/minecraft/onesix/update/LibrariesTask.cpp @@ -13,7 +13,7 @@ void LibrariesTask::executeTask() qDebug() << m_inst->name() << ": downloading libraries"; OneSixInstance *inst = (OneSixInstance *)m_inst; inst->reloadProfile(); - if(inst->flags() & BaseInstance::VersionBrokenFlag) + if(inst->hasVersionBroken()) { emitFailed(tr("Failed to load the version description files - check the instance for errors.")); return; -- cgit v1.2.3