From 979f3b4688685a32b22bc1efc9ecf2eeaeeca61e Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 18 Sep 2011 13:17:24 +0200
Subject: [PATCH] fix a NIX issue

---
 qcsrc/server/cl_weapons.qc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index afe3088d4..fe6789618 100644
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -412,7 +412,8 @@ void W_WeaponFrame()
 		c = c + 1;
 		if(wb && ((self.weapons & wb) == 0))
 		{
-			W_SwitchWeapon_Force(self, w_getbestweapon(self));
+			if(self.weapon == self.switchweapon)
+				W_SwitchWeapon_Force(self, w_getbestweapon(self));
 			wb = 0;
 		}
 
-- 
2.39.2