summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2017-04-22 20:27:00 +0200
committerPetr Mrázek <peterix@gmail.com>2017-04-22 20:27:00 +0200
commit8084f27ec8b6771a02da3f7f08815746955e5f31 (patch)
treec8bb8b98fe27e6bad73773a3b51d116d24a78f36
parent249baf6fcf0d06eb59b741be4d7bb50faea42926 (diff)
downloadMultiMC-8084f27ec8b6771a02da3f7f08815746955e5f31.tar
MultiMC-8084f27ec8b6771a02da3f7f08815746955e5f31.tar.gz
MultiMC-8084f27ec8b6771a02da3f7f08815746955e5f31.tar.lz
MultiMC-8084f27ec8b6771a02da3f7f08815746955e5f31.tar.xz
MultiMC-8084f27ec8b6771a02da3f7f08815746955e5f31.zip
NOISSUE do not write library display name twice
-rw-r--r--api/logic/minecraft/onesix/OneSixVersionFormat.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/api/logic/minecraft/onesix/OneSixVersionFormat.cpp b/api/logic/minecraft/onesix/OneSixVersionFormat.cpp
index cded5e9d..632bf2d9 100644
--- a/api/logic/minecraft/onesix/OneSixVersionFormat.cpp
+++ b/api/logic/minecraft/onesix/OneSixVersionFormat.cpp
@@ -313,19 +313,13 @@ LibraryPtr OneSixVersionFormat::plusJarModFromJson(const QJsonObject &libObj, co
LibraryPtr OneSixVersionFormat::jarModFromJson(const QJsonObject& libObj, const QString& filename)
{
- auto lib = libraryFromJson(libObj, filename);
- return lib;
+ return libraryFromJson(libObj, filename);
}
QJsonObject OneSixVersionFormat::jarModtoJson(Library *jarmod)
{
- QJsonObject out = libraryToJson(jarmod);
- if(!jarmod->m_displayname.isEmpty())
- {
- writeString(out, "originalName", jarmod->m_displayname);
- }
- return out;
+ return libraryToJson(jarmod);
}
LibraryPtr OneSixVersionFormat::modFromJson(const QJsonObject& libObj, const QString& filename)