From 3b8e75c9e1ed6f9647849f855cc069287c31c291 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 25 Dec 2011 15:23:14 +0300
Subject: Allow close npc dialog if server script working incorrectly.

---
 src/gui/npcdialog.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index 66a30c8a7..1b0193c65 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -48,7 +48,7 @@
 
 #include "debug.h"
 
-#define CAPTION_WAITING _("Waiting for server")
+#define CAPTION_WAITING _("Stop waiting")
 #define CAPTION_NEXT _("Next")
 #define CAPTION_CLOSE _("Close")
 #define CAPTION_SUBMIT _("Submit")
@@ -222,7 +222,8 @@ void NpcDialog::action(const gcn::ActionEvent &event)
             nextDialog();
             addText(_("> Next"), false);
         }
-        else if (mActionState == NPC_ACTION_CLOSE)
+        else if (mActionState == NPC_ACTION_CLOSE
+                 || mActionState == NPC_ACTION_WAIT)
         {
             closeDialog();
         }
@@ -501,8 +502,6 @@ void NpcDialog::buildLayout()
     Layout &layout = getLayout();
     layout.setRowHeight(0, Layout::AUTO_SET);
 
-    mButton->setEnabled(mActionState != NPC_ACTION_WAIT);
-
     redraw();
 
     mScrollArea->setVerticalScrollAmount(mScrollArea->getVerticalMaxScroll());
-- 
cgit v1.2.3-70-g09d2