From 5928b365b7dcfae2a5626f4aba522438accdc1cc Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@gmail.com>
Date: Wed, 23 Dec 2009 19:01:49 +0000
Subject: [PATCH] quicknaderelease fixes

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4745 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/weapon.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp
index 1382423f..930749a3 100644
--- a/source/src/weapon.cpp
+++ b/source/src/weapon.cpp
@@ -97,10 +97,10 @@ void shiftweapon(int s)
 
 void quicknaderelease()
 {
-    if(player1->state == CS_ALIVE && player1->weaponsel->type == GUN_GRENADE)
+    if(player1->state == CS_ALIVE)
     {
         attack(false);
-        selectweapon(player1->prevweaponsel);
+        if(player1->weaponsel->type == GUN_GRENADE) selectweapon(player1->prevweaponsel);
     }
 }