X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Ffg_props.cxx;h=975a8a48cfe5dc4fa7923bdd1e2d795d45b955bc;hb=0c00cd3c6d34e4e167457897a274864cb7236da6;hp=7e4c6859c6508eb4db41433b680ef2856f04c9b2;hpb=33082b186f7a2c47a94dd20106f59180e8104db0;p=flightgear.git diff --git a/src/Main/fg_props.cxx b/src/Main/fg_props.cxx index 7e4c6859c..975a8a48c 100644 --- a/src/Main/fg_props.cxx +++ b/src/Main/fg_props.cxx @@ -684,15 +684,15 @@ fgLoadFlight (std::istream &input) bool -fgLoadProps (const char * path, SGPropertyNode * props, bool in_fg_root, int default_mode) +fgLoadProps (const std::string& path, SGPropertyNode * props, bool in_fg_root, int default_mode) { - string fullpath; + SGPath fullpath; if (in_fg_root) { SGPath loadpath(globals->get_fg_root()); loadpath.append(path); - fullpath = loadpath.str(); + fullpath = loadpath; } else { - fullpath = path; + fullpath = SGPath::fromUtf8(path); } try {