Unbreak importing files in the same directory as current file. · mdecourse/solvespace@215b8e4 · GitHub

1. mdecourse
2. solvespace

Repository navigation

• Code
• Pull requests
• Discussions
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Commit 215b8e4

Browse filesBrowse the repository at this point in the historyBrowse files

whitequark

committed

Unbreak importing files in the same directory as current file.

This commit fixes a bug introduced in commit 0d7aa0a.

1 parent 122920d commit 215b8e4
Copy full SHA for 215b8e4

1 file changed

+14-11Lines changed: 14 additions & 11 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• src
  • file.cpp

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎src/file.cpp‎

Copy file name to clipboardExpand all lines: src/file.cpp

+14-11Lines changed: 14 additions & 11 deletions

Original file line number	Diff line number	Diff line change
@@ -804,17 +804,20 @@ bool SolveSpaceUI::ReloadAllImported(bool canCancel)
804	804	g->linkFile = newPath;
805	805	}
806	806
807		- std::string rel = PathSepUNIXToPlatform(g->linkFileRel);
808		- std::string fromRel = MakePathAbsolute(SS.saveFile, rel);
809		- FILE *test = ssfopen(fromRel, "rb");
810		- if(test) {
811		- fclose(test);
812		- // Okay, exists; update the absolute path.
813		- g->linkFile = fromRel;
814		- } else {
815		- // It doesn't exist. Perhaps the file was moved but the tree wasn't, and we
816		- // can use the absolute filename to get us back. The relative path will be
817		- // updated below.
	807	+ // In a newly created group we only have an absolute path.
	808	+ if(!g->linkFileRel.empty()) {
	809	+ std::string rel = PathSepUNIXToPlatform(g->linkFileRel);
	810	+ std::string fromRel = MakePathAbsolute(SS.saveFile, rel);
	811	+ FILE *test = ssfopen(fromRel, "rb");
	812	+ if(test) {
	813	+ fclose(test);
	814	+ // Okay, exists; update the absolute path.
	815	+ g->linkFile = fromRel;
	816	+ } else {
	817	+ // It doesn't exist. Perhaps the file was moved but the tree wasn't, and we
	818	+ // can use the absolute filename to get us back. The relative path will be
	819	+ // updated below.
	820	+ }
818	821	}
819	822
820	823	try_load_file:

0 commit comments

Comments

0 (0)