diff options
Diffstat (limited to 'tools/bookmaker/cataloger.cpp')
-rw-r--r-- | tools/bookmaker/cataloger.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/bookmaker/cataloger.cpp b/tools/bookmaker/cataloger.cpp index 0e1e38ac45..c6aae74c30 100644 --- a/tools/bookmaker/cataloger.cpp +++ b/tools/bookmaker/cataloger.cpp @@ -79,14 +79,13 @@ bool Catalog::closeCatalog() { } bool Catalog::parseFromFile(const char* path) { - if (!INHERITED::parseSetup(path)) { + if (!INHERITED::parseFromFile(path)) { return false; } fIndent = 4; this->writeString("var text = {"); this->lf(1); fTextOut = true; - TextParserSave save(this); if (!parseFiddles()) { return false; } @@ -96,7 +95,8 @@ bool Catalog::parseFromFile(const char* path) { this->writeString("var pngs = {"); fTextOut = false; fPngOut = true; - save.restore(); + JsonStatus* status = &fStack.back(); + status->fIter = status->fObject.begin(); fContinuation = false; return parseFiddles(); } |