From 8389ed0c9a6eca0e291b3b990988274f43a45921 Mon Sep 17 00:00:00 2001 From: twanvl Date: Fri, 8 Aug 2008 13:55:59 +0000 Subject: [PATCH] Fixed: include files where not read with the same ignore_invalid settings git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1097 0fc631ac-6414-0410-93d0-97cfa31319b6 --- src/util/io/reader.cpp | 4 ++-- src/util/io/reader.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/io/reader.cpp b/src/util/io/reader.cpp index 3347f786..be3bfcae 100644 --- a/src/util/io/reader.cpp +++ b/src/util/io/reader.cpp @@ -25,9 +25,9 @@ Reader::Reader(const InputStreamP& input, Packaged* package, const String& filen handleAppVersion(); } -Reader::Reader(Packaged* pkg, const String& filename) +Reader::Reader(Packaged* pkg, const String& filename, bool ignore_invalid) : indent(0), expected_indent(0), state(OUTSIDE) - , ignore_invalid(false) + , ignore_invalid(ignore_invalid) , filename(filename), package(pkg), line_number(0), previous_line_number(0) , input(package_manager.openFileFromPackage(package, filename)) { diff --git a/src/util/io/reader.hpp b/src/util/io/reader.hpp index 3604d5bf..008d0fec 100644 --- a/src/util/io/reader.hpp +++ b/src/util/io/reader.hpp @@ -42,7 +42,7 @@ class Reader { /** Used for "include file" keys. * package can be nullptr */ - Reader(Packaged* package, const String& filename); + Reader(Packaged* package, const String& filename, bool ignore_invalid = false); ~Reader() { showWarnings(); } @@ -182,7 +182,7 @@ class Reader { template void unknownKey(T& v) { if (key == _("include file")) { - Reader reader(package, value); + Reader reader(package, value, ignore_invalid); reader.handle_greedy(v); moveNext(); } else {