From 6c90ba86aec68c76c153e51acc0315fe91ebc03e Mon Sep 17 00:00:00 2001 From: JustinAJ Date: Sun, 8 Jun 2014 22:32:24 -0400 Subject: [PATCH] Fixed INI parsing when first character in value is '='. --- Jupiter/INIFile.cpp | 2 +- Release/Jupiter.lib | Bin 219206 -> 219206 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Jupiter/INIFile.cpp b/Jupiter/INIFile.cpp index 24ee397..5396bad 100644 --- a/Jupiter/INIFile.cpp +++ b/Jupiter/INIFile.cpp @@ -274,10 +274,10 @@ unsigned int Jupiter::INIFile::readFile(const char *fileName) else if (line.contains('=')) // key/value pair. { Jupiter::ReferenceString key = line.getWord(0, "="); + Jupiter::ReferenceString value = line.substring(key.size() + 1); while (key.size() != 0 && isspace(key.get(key.size() - 1))) key.truncate(1); - Jupiter::ReferenceString value = line.gotoWord(1, "="); while (value.size() != 0 && isspace(value.get(0))) value.shiftRight(1); diff --git a/Release/Jupiter.lib b/Release/Jupiter.lib index d8a0ce2c90fe9fcb07b2d94b410b64e0bb5a242a..b9eb1d880f8310601c4a977ee547eb01cca2e240 100644 GIT binary patch delta 15785 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 Tt=qe6Ci8A2CC7E2Vs`rv&MBKQ delta 15791 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 f#H7pR$*i8H%j7A(b$fU16yA-b