diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java index 2af200ec8..156232bfb 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java @@ -157,7 +157,12 @@ public class Blacksmith extends NPC { } private void tell( String text ) { - GameScene.show( new WndQuest( this, text ) ); + Game.runOnRenderThread(new Callback() { + @Override + public void call() { + GameScene.show( new WndQuest( Blacksmith.this, text ) ); + } + }); } public static String verify( Item item1, Item item2 ) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java index 43473593b..dd3896dd9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java @@ -63,8 +63,10 @@ import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag; import com.shatteredpixel.shatteredpixeldungeon.windows.WndBlacksmith; import com.shatteredpixel.shatteredpixeldungeon.windows.WndItem; import com.shatteredpixel.shatteredpixeldungeon.windows.WndQuest; +import com.watabou.noosa.Game; import com.watabou.noosa.audio.Sample; import com.watabou.utils.Bundle; +import com.watabou.utils.Callback; import com.watabou.utils.PathFinder; import com.watabou.utils.Random; @@ -697,7 +699,12 @@ public class DriedRose extends Artifact { updateRose(); if (rose != null && !rose.talkedTo){ rose.talkedTo = true; - GameScene.show(new WndQuest(this, Messages.get(this, "introduce") )); + Game.runOnRenderThread(new Callback() { + @Override + public void call() { + GameScene.show(new WndQuest(GhostHero.this, Messages.get(GhostHero.this, "introduce") )); + } + }); return false; } else { return super.interact();