mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-06-22 18:21:52 +00:00
Fixed new GCPad/Wiimote plugin IniFile code to handle saving/loading of values with leading/trailing whitespace. Was causing issues with gamepads that had trailing whitespace in their names. Also, reordered drum pad colors in the GUI to match their physical layout.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5404 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
23689387e1
commit
8d5c9f30ad
2 changed files with 18 additions and 4 deletions
|
@ -66,7 +66,15 @@ void IniFile::Save( std::ostream& file )
|
|||
Section::const_iterator si = i->second.begin(),
|
||||
se = i->second.end();
|
||||
for ( ; si != se; ++si )
|
||||
file << si->first << " = " << si->second << '\n';
|
||||
{
|
||||
file << si->first << " = ";
|
||||
// if value has quotes or whitespace, surround it with quotes
|
||||
if (si->second.find_first_of("\"\t ") != std::string::npos)
|
||||
file << '"' << si->second << '"';
|
||||
else
|
||||
file << si->second;
|
||||
file << '\n';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -103,7 +111,13 @@ void IniFile::Load( std::istream& file )
|
|||
std::istringstream ss(line);
|
||||
std::string key; std::getline( ss, key, '=' );
|
||||
std::string val; std::getline( ss, val );
|
||||
(*section)[ TrimChars(key,space) ] = TrimChars(val,space);
|
||||
val = TrimChars(val,space);
|
||||
// handle quote surrounded values
|
||||
if (val.length() > 1)
|
||||
if ('"' == val[0])
|
||||
val = val.substr(1, val.length()-2);
|
||||
|
||||
(*section)[ TrimChars(key,space) ] = val;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue