suzanne.soy/solvespace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

When opening imported files, first try relative path.

Browse Source 
Without this, if we have e.g.:
  * a/x.slvs
  * a/y.slvs importing a/x.slvs
and copy a/ to b/, then loading b/y.slvs would load a/x.slvs, which
is rather surprising.
This commit is contained in:
whitequark 2016-05-17 14:44:33 +00:00
parent 3bdaa53725
commit 0d7aa0a1a3
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/file.cpp
View File

@ -806,22 +806,17 @@ bool SolveSpaceUI::ReloadAllImported(bool canCancel)
g->linkFile = newPath; g->linkFile = newPath;
} }
FILE *test = ssfopen(g->linkFile, "rb"); std::string rel = PathSepUNIXToPlatform(g->linkFileRel);
std::string fromRel = MakePathAbsolute(SS.saveFile, rel);
FILE *test = ssfopen(fromRel, "rb");
if(test) { if(test) {
fclose(test); // okay, exists fclose(test);
// Okay, exists; update the absolute path.
g->linkFile = fromRel;
} else { } else {
// It doesn't exist. Perhaps the entire tree has moved, and we // It doesn't exist. Perhaps the file was moved but the tree wasn't, and we
// can use the relative filename to get us back. // can use the absolute filename to get us back. The relative path will be
if(!SS.saveFile.empty()) { // updated below.
std::string rel = PathSepUNIXToPlatform(g->linkFileRel);
std::string fromRel = MakePathAbsolute(SS.saveFile, rel);
test = ssfopen(fromRel, "rb");
if(test) {
fclose(test);
// It worked, this is our new absolute path
g->linkFile = fromRel;
}
}
} }
try_load_file: try_load_file: