1 files changed, 10 insertions, 4 deletions
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index dc7deef6..818413c2 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -1,9 +1,8 @@
 /*
- *  Aethyra
+ *  The Mana World
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of Aethyra based on original code
- *  from The Mana World.
+ *  This file is part of The Mana World.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -55,12 +54,19 @@ BuySellDialog::BuySellDialog(Network *network):
     requestFocus();
 }
 
+void BuySellDialog::logic()
+{
+    Window::logic();
+
+    if (!current_npc) setVisible(false);
+}
+
 void BuySellDialog::action(const gcn::ActionEvent &event)
 {
     setVisible(false);
     int action = 0;
 
-    NPC::mTalking = false;
+    NPC::isTalking = false;
 
     if (event.getId() == "Buy")
     {