diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-09-06 18:16:56 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-09-06 19:03:05 +0200 |
| commit | 20cb97a35af5097e9d3b2062c0dfcb5f2e5fff5c (patch) | |
| tree | 56bf51e681f2e73590a549499bd83d7b505c39f8 /logic/OneSixInstance.cpp | |
| parent | 36efcf8d3c0cbd7823fc65569cfc2b011435db2c (diff) | |
| download | MultiMC-20cb97a35af5097e9d3b2062c0dfcb5f2e5fff5c.tar MultiMC-20cb97a35af5097e9d3b2062c0dfcb5f2e5fff5c.tar.gz MultiMC-20cb97a35af5097e9d3b2062c0dfcb5f2e5fff5c.tar.lz MultiMC-20cb97a35af5097e9d3b2062c0dfcb5f2e5fff5c.tar.xz MultiMC-20cb97a35af5097e9d3b2062c0dfcb5f2e5fff5c.zip | |
Sync from quickmods
Diffstat (limited to 'logic/OneSixInstance.cpp')
| -rw-r--r-- | logic/OneSixInstance.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp index 82d4e480..00d8a9db 100644 --- a/logic/OneSixInstance.cpp +++ b/logic/OneSixInstance.cpp @@ -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()); +} |