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

Auto-recover files corrupted by the bug in commit bd84bc1a.

Browse Source
This commit is contained in:
whitequark 2019-06-25 00:48:57 +00:00
parent 49a7f863b8
commit 02d7f0c0aa
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/file.cpp
View File

@ -436,8 +436,17 @@ void SolveSpaceUI::LoadUsingTable(const Platform::Path &filename, char *key, cha
if (fgets(line2, (int)sizeof(line2), fh) == NULL) if (fgets(line2, (int)sizeof(line2), fh) == NULL)
break; break;
if(sscanf(line2, "%d %x %d", &(ei.v), &(ek.input.v), if(sscanf(line2, "%d %x %d", &(ei.v), &(ek.input.v),
&(ek.copyNumber)) == 3) &(ek.copyNumber)) == 3) {
{ if(ei.v == Entity::NO_ENTITY.v) {
// Commit bd84bc1a mistakenly introduced code that would remap
// some entities to NO_ENTITY. This was fixed in commit bd84bc1a,
// but files created meanwhile are corrupt, and can cause crashes.
//
// To fix this, we skip any such remaps when loading; they will be
// recreated on the next regeneration. Any resulting orphans will
// be pruned in the usual way, recovering to a well-defined state.
continue;
}
p->M().insert({ ek, ei }); p->M().insert({ ek, ei });
} else { } else {
break; break;