fly/flightgear
1
0
Fork 0
Code Activity

Change default Windows terrasync path

Browse source 
Now use (new) SGPath::documents helper to download
to a user-visible location: Document\FlightGear.
(Linux & Mac behaviour is unchanged)
This commit is contained in:
James Turner 2014-01-26 16:05:45 +00:00
parent 3254f54f9e
commit 9f3a2ddbdc
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/Main/options.cxx
View file

@ -2106,6 +2106,20 @@ string_list Options::valuesForOption(const std::string& key) const
return result;
}
static string defaultTerrasyncDir()
{
#if defined(SG_WINDOWS)
SGPath p(SGPath::documents());
p.append("FlightGear");
#else
SGPath p(globals->get_fg_home());
#endif
p.append("TerraSync");
return p.str();
}
OptionResult Options::processOptions()
{
// establish locale before showing help (this selects the default locale,
@ -2169,15 +2183,16 @@ OptionResult Options::processOptions()
// terrasync directory fixup
string terrasyncDir = fgGetString("/sim/terrasync/scenery-dir");
if (terrasyncDir.empty()) {
SGPath p(globals->get_fg_home());
p.append("TerraSync");
terrasyncDir = p.str();
SG_LOG(SG_GENERAL, SG_INFO,
"Using default TerraSync dir: " << terrasyncDir);
fgSetString("/sim/terrasync/scenery-dir", terrasyncDir);
terrasyncDir = defaultTerrasyncDir();
// auto-save it for next time
SG_LOG(SG_GENERAL, SG_INFO,
"Using default TerraSync: " << terrasyncDir);
fgSetString("/sim/terrasync/scenery-dir", terrasyncDir);
}
SGPath p(terrasyncDir);
// following is necessary to ensure NavDataCache sees stable scenery paths from
// terrasync. Ensure the Terrain and Objects subdirs exist immediately, rather
// than waiting for the first tiles to be scheduled.