diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-02-24 02:35:01 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-02-24 02:35:01 +0100 |
| commit | 49dc9695f5204bb80a91214c411bcb1b868ee0db (patch) | |
| tree | a7867064f70ab7888c32eebf42e4bdc8bc59c32e /logic/LegacyInstance.cpp | |
| parent | f7c97efcf3785f597417895945b24c2e7476cba8 (diff) | |
| parent | 0b56b5efafffca77d6deee966097c55e78fb0aef (diff) | |
| download | MultiMC-49dc9695f5204bb80a91214c411bcb1b868ee0db.tar MultiMC-49dc9695f5204bb80a91214c411bcb1b868ee0db.tar.gz MultiMC-49dc9695f5204bb80a91214c411bcb1b868ee0db.tar.lz MultiMC-49dc9695f5204bb80a91214c411bcb1b868ee0db.tar.xz MultiMC-49dc9695f5204bb80a91214c411bcb1b868ee0db.zip | |
Merge branch 'fix_json_version' into integration_json_and_tools
Conflicts:
logic/OneSixInstance.cpp
logic/OneSixVersionBuilder.cpp
Some fixage. Yay for conflicts.
Diffstat (limited to 'logic/LegacyInstance.cpp')
| -rw-r--r-- | logic/LegacyInstance.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/logic/LegacyInstance.cpp b/logic/LegacyInstance.cpp index 6cd17fea..3b9181e0 100644 --- a/logic/LegacyInstance.cpp +++ b/logic/LegacyInstance.cpp @@ -268,13 +268,23 @@ QString LegacyInstance::defaultCustomBaseJar() const bool LegacyInstance::menuActionEnabled(QString action_name) const { + if (flags() & VersionBrokenFlag) + { + return false; + } if (action_name == "actionChangeInstMCVersion") + { return false; + } return true; } QString LegacyInstance::getStatusbarDescription() { + if (flags() & VersionBrokenFlag) + { + return "Legacy : " + intendedVersionId() + " (broken)"; + } if (shouldUpdate()) return "Legacy : " + currentVersionId() + " -> " + intendedVersionId(); else |