NOISSUE do not write library display name twice

This commit is contained in:
Petr Mrázek 2017-04-22 20:27:00 +02:00
parent 249baf6fcf
commit 8084f27ec8

View File

@ -313,19 +313,13 @@ LibraryPtr OneSixVersionFormat::plusJarModFromJson(const QJsonObject &libObj, co
LibraryPtr OneSixVersionFormat::jarModFromJson(const QJsonObject& libObj, const QString& filename) LibraryPtr OneSixVersionFormat::jarModFromJson(const QJsonObject& libObj, const QString& filename)
{ {
auto lib = libraryFromJson(libObj, filename); return libraryFromJson(libObj, filename);
return lib;
} }
QJsonObject OneSixVersionFormat::jarModtoJson(Library *jarmod) QJsonObject OneSixVersionFormat::jarModtoJson(Library *jarmod)
{ {
QJsonObject out = libraryToJson(jarmod); return libraryToJson(jarmod);
if(!jarmod->m_displayname.isEmpty())
{
writeString(out, "originalName", jarmod->m_displayname);
}
return out;
} }
LibraryPtr OneSixVersionFormat::modFromJson(const QJsonObject& libObj, const QString& filename) LibraryPtr OneSixVersionFormat::modFromJson(const QJsonObject& libObj, const QString& filename)