fix replacement of multiple environment variables (result was not cleared for next iteration)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37699 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Joost Verburg 2011-02-16 18:59:19 +00:00
parent fbdf441a93
commit 75218491f9

View File

@ -546,9 +546,9 @@ string const replaceEnvironmentPath(string const & path)
static regex envvar_br_re("(.*)" + envvar_br + "(.*)"); static regex envvar_br_re("(.*)" + envvar_br + "(.*)");
static regex envvar_re("(.*)" + envvar + "(.*)"); static regex envvar_re("(.*)" + envvar + "(.*)");
smatch what;
string result = path; string result = path;
while (1) { while (1) {
smatch what;
regex_match(result, what, envvar_br_re); regex_match(result, what, envvar_br_re);
if (!what[0].matched) { if (!what[0].matched) {
regex_match(result, what, envvar_re); regex_match(result, what, envvar_re);