From 5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0 Mon Sep 17 00:00:00 2001
From: Kisuka <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Wed, 9 Mar 2011 12:50:24 +0000
Subject: * Merged changes from trunk [14688:14739/trunk].

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14740 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/trade.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/map/trade.c')

diff --git a/src/map/trade.c b/src/map/trade.c
index ba01826f2..bedbb9451 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -138,8 +138,8 @@ void trade_tradeack(struct map_session_data *sd, int type)
 	}
 
 	//Check if you can start trade.
-	if (sd->npc_id || sd->vender_id || sd->state.storage_flag ||
-		tsd->npc_id || tsd->vender_id || tsd->state.storage_flag)
+	if (sd->npc_id || sd->vender_id || sd->state.buyingstore || sd->state.storage_flag ||
+		tsd->npc_id || tsd->vender_id || tsd->state.buyingstore || tsd->state.storage_flag)
 	{	//Fail
 		clif_tradestart(sd, 2);
 		clif_tradestart(tsd, 2);
-- 
cgit v1.2.3-70-g09d2