Merge branch 'aethyra/master'

Conflicts:
	data/graphics/images/login_wallpaper.png
	src/being.cpp
	src/beingmanager.cpp
	src/engine.cpp
	src/game.cpp
	src/gui/buysell.cpp
	src/gui/buysell.h
	src/gui/gui.h
	src/gui/npc_text.cpp
	src/gui/npc_text.h
	src/gui/npcintegerdialog.cpp
	src/gui/npclistdialog.cpp
	src/gui/npclistdialog.h
	src/gui/npcstringdialog.cpp
	src/gui/sell.cpp
	src/gui/shop.cpp
	src/gui/table.cpp
	src/net/beinghandler.cpp
	src/net/npchandler.cpp
	src/net/playerhandler.cpp
	src/npc.cpp
	src/npc.h
	src/shopitem.cpp
	src/shopitem.h
	src/utils/stringutils.cpp
	src/utils/stringutils.h
	src/utils/trim.h

1 files changed, 4 insertions, 0 deletions

diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp
index 7ed05288..fb3b43db 100644
--- a/src/gui/npcstringdialog.cpp
+++ b/src/gui/npcstringdialog.cpp
@@ -77,6 +77,8 @@ void NpcStringDialog::action(const gcn::ActionEvent &event)
     }
 
     setVisible(false);
+    NPC::isTalking = false;
+
     std::string text = mValueField->getText();
     mValueField->setText("");
 
@@ -86,6 +88,8 @@ void NpcStringDialog::action(const gcn::ActionEvent &event)
     outMsg.writeInt32(current_npc);
     outMsg.writeString(text, text.length());
     outMsg.writeInt8(0);
+
+    current_npc = 0;
 }
 
 bool NpcStringDialog::isInputFocused()