hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2020-03-12 15:32:30 +01:00
commit 7b52f0cd92
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/json.cpp
View file

@ -178,7 +178,7 @@ static std::string read_string(char separator, std::istream &fromstream){
while (fromstream.good()){ while (fromstream.good()){
char c; char c;
fromstream.get(c); fromstream.get(c);
if (c == '\\'){ if (!escaped && c == '\\'){
escaped = true; escaped = true;
continue; continue;
} }
@ -189,6 +189,7 @@ static std::string read_string(char separator, std::istream &fromstream){
} }
switch (c){ switch (c){
case 'b': out += '\b'; break; case 'b': out += '\b'; break;
case '\\': out += '\\'; break;
case 'f': out += '\f'; break; case 'f': out += '\f'; break;
case 'n': out += '\n'; break; case 'n': out += '\n'; break;
case 'r': out += '\r'; break; case 'r': out += '\r'; break;