#else
// POSIX, do open+unlink trick to the file is deleted on exit, even if we
// crash or exit(-1)
- size_t len = snprintf(buf, 16, "%d", getpid());
+ ssize_t len = snprintf(buf, 16, "%d", getpid());
int fd = ::open(pidPath.c_str(), O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0644);
if (fd >= 0) {
- ::write(fd, buf, len);
- ::unlink(pidPath.c_str()); // delete file when app quits
- result = true;
+ result = ::write(fd, buf, len) == len;
+ if( ::unlink(pidPath.c_str()) != 0 ) // delete file when app quits
+ result = false;
}
-
- fgSetBool("/sim/fghome-readonly", false);
#endif
+
+ fgSetBool("/sim/fghome-readonly", false);
+
if (!result) {
flightgear::fatalMessageBox("File permissions problem",
"Can't write to user-data storage folder, check file permissions and FG_HOME.",
void fgStartNewReset()
{
- globals->saveInitialState();
+ SGPropertyNode_ptr preserved(new SGPropertyNode);
+
+ // copy properties which are USERARCHIVEd or PRESERVEd
+ int checked = SGPropertyNode::USERARCHIVE+SGPropertyNode::PRESERVE;
+ if (!copyProperties(globals->get_props(), preserved, checked, checked))
+ SG_LOG(SG_GENERAL, SG_ALERT, "Error saving preserved state");
fgSetBool("/sim/signals/reinit", true);
fgSetBool("/sim/freeze/master", true);
// don't cancel the pager until after shutdown, since AIModels (and
// potentially others) can queue delete requests on the pager.
render->getViewer()->getDatabasePager()->cancel();
+ render->getViewer()->getDatabasePager()->clear();
osgDB::Registry::instance()->clearObjectCache();
simgear::SGModelLib::resetPropertyRoot();
globals->resetPropertyRoot();
- globals->restoreInitialState();
fgInitConfig(0, NULL, true);
fgInitGeneral(); // all of this?
- fgGetNode("/sim")->removeChild("aircraft-dir");
+ if ( copyProperties(preserved, globals->get_props(), checked, checked)) {
+ SG_LOG( SG_GENERAL, SG_INFO, "Preserved state restored successfully" );
+ } else {
+ SG_LOG( SG_GENERAL, SG_INFO,
+ "Some errors restoring preserved state (read-only props?)" );
+ }
+
+ fgGetNode("/sim")->removeChild("aircraft-dir");
fgInitAircraft(true);
flightgear::Options::sharedInstance()->processOptions();