mirror of
https://github.com/UltimMC/Launcher.git
synced 2025-10-04 17:09:25 +00:00
Sync from quickmods
This commit is contained in:
@@ -418,7 +418,7 @@ void OneSixInstance::reloadVersion()
|
||||
try
|
||||
{
|
||||
d->version->reload(externalPatches());
|
||||
d->m_flags.remove(VersionBrokenFlag);
|
||||
unsetFlag(VersionBrokenFlag);
|
||||
emit versionReloaded();
|
||||
}
|
||||
catch (VersionIncomplete &error)
|
||||
@@ -427,7 +427,7 @@ void OneSixInstance::reloadVersion()
|
||||
catch (MMCError &error)
|
||||
{
|
||||
d->version->clear();
|
||||
d->m_flags.insert(VersionBrokenFlag);
|
||||
setFlag(VersionBrokenFlag);
|
||||
// TODO: rethrow to show some error message(s)?
|
||||
emit versionReloaded();
|
||||
throw;
|
||||
@@ -464,7 +464,7 @@ QString OneSixInstance::getStatusbarDescription()
|
||||
{
|
||||
traits.append(tr("custom"));
|
||||
}
|
||||
if (flags().contains(VersionBrokenFlag))
|
||||
if (flags() & VersionBrokenFlag)
|
||||
{
|
||||
traits.append(tr("broken"));
|
||||
}
|
||||
@@ -569,3 +569,8 @@ QStringList OneSixInstance::extraArguments() const
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
std::shared_ptr<OneSixInstance> OneSixInstance::getSharedPtr()
|
||||
{
|
||||
return std::dynamic_pointer_cast<OneSixInstance>(BaseInstance::getSharedPtr());
|
||||
}
|
||||
|
Reference in New Issue
Block a user