zcy
/
solvespace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak importing files in the same directory as current file. 

This commit fixes a bug introduced in commit 0d7aa0a1.
pull/10/head
whitequark 2016-06-06 16:05:37 +00:00
parent 122920d3ee
commit 215b8e4537
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/file.cpp
View File

@ -804,6 +804,8 @@ bool SolveSpaceUI::ReloadAllImported(bool canCancel)
g->linkFile = newPath; g->linkFile = newPath;
} }
// In a newly created group we only have an absolute path.
if(!g->linkFileRel.empty()) {
std::string rel = PathSepUNIXToPlatform(g->linkFileRel); std::string rel = PathSepUNIXToPlatform(g->linkFileRel);
std::string fromRel = MakePathAbsolute(SS.saveFile, rel); std::string fromRel = MakePathAbsolute(SS.saveFile, rel);
FILE *test = ssfopen(fromRel, "rb"); FILE *test = ssfopen(fromRel, "rb");
@ -816,6 +818,7 @@ bool SolveSpaceUI::ReloadAllImported(bool canCancel)
// can use the absolute filename to get us back. The relative path will be // can use the absolute filename to get us back. The relative path will be
// updated below. // updated below.
} }
}
try_load_file: try_load_file:
if(LoadEntitiesFromFile(g->linkFile, &(g->impEntity), &(g->impMesh), &(g->impShell))) if(LoadEntitiesFromFile(g->linkFile, &(g->impEntity), &(g->impMesh), &(g->impShell)))