From 31bd42152e308c0c28be6a38750943f4fc90ae28 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Mon, 26 Jan 2015 02:14:00 -0500
Subject: [PATCH] v0.2.3f: corrected crash involving quickslot placeholders,
 dungeon now loads them at the correct time.

---
 src/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java b/src/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java
index b3a7d847e..dc5c9f3a4 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java
@@ -574,7 +574,6 @@ public class Dungeon {
 		Generator.reset();
 
 		quickslot.reset();
-		quickslot.restorePlaceholders( bundle );
 
         Dungeon.challenges = bundle.getInt( CHALLENGES );
 		
@@ -590,6 +589,7 @@ public class Dungeon {
 		Wand.restore( bundle );
 		Ring.restore( bundle );
 
+		quickslot.restorePlaceholders( bundle );
 		
 		if (fullLoad) {