From 864cabb5900c61923db9bdbee32ca4641ee7f7e4 Mon Sep 17 00:00:00 2001
From: twanvl <twanvl@0fc631ac-6414-0410-93d0-97cfa31319b6>
Date: Wed, 21 Jul 2010 18:49:12 +0000
Subject: [PATCH] fixed nullptr exception when opening a stylesheet without a
 game twice, the solution is to re-load when loading/validating fails the
 first time

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1451 0fc631ac-6414-0410-93d0-97cfa31319b6
---
 src/util/io/package.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util/io/package.cpp b/src/util/io/package.cpp
index 96f516ff..39e061af 100644
--- a/src/util/io/package.cpp
+++ b/src/util/io/package.cpp
@@ -556,11 +556,11 @@ void Packaged::open(const String& package, bool just_header) {
 }
 void Packaged::loadFully() {
 	if (fully_loaded) return;
-	fully_loaded = true;
 	Reader reader(openIn(typeName()), this, absoluteFilename() + _("/") + typeName());
 	try {
 		reader.handle_greedy(*this);
 		validate(reader.file_app_version);
+		fully_loaded = true; // only after loading and validating succeeded, be careful with recursion!
 	} catch (const ParseError& err) {
 		throw FileParseError(err.what(), absoluteFilename() + _("/") + typeName()); // more detailed message
 	}