From 7cc9f1a11f2ed4b8353377f9b64b093fc6bc0205 Mon Sep 17 00:00:00 2001
From: aurhat <6187373+aurhat@users.noreply.github.com>
Date: Wed, 20 Oct 2021 22:49:29 +0200
Subject: [PATCH] fix automatic switching to primary weapon after grenade throw

When player had only one grenade and threw it, and switched to edit mode
before "attackmillis >= throwwait", then grenade stayed in his hand,
although there weren't any grenades in magazine.
---
 source/src/editing.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/src/editing.cpp b/source/src/editing.cpp
index 44805154..418bc6e5 100644
--- a/source/src/editing.cpp
+++ b/source/src/editing.cpp
@@ -70,7 +70,7 @@ void toggleedit(bool force)
     player1->state = editing ? CS_EDITING : (watchingdemo ? CS_SPECTATE : CS_ALIVE);
     if(editing && player1->onladder) player1->onladder = false;
     if(editing && (player1->weaponsel->type == GUN_SNIPER && ((sniperrifle *)player1->weaponsel)->scoped)) ((sniperrifle *)player1->weaponsel)->onownerdies(); // or ondeselecting()
-    if(editing && (player1->weaponsel->type == GUN_GRENADE)) ((grenades *)player1->weaponsel)->onownerdies();
+    if(editing && (player1->weaponsel->type == GUN_GRENADE) && ((grenades *)player1->weaponsel)->state < GST_THROWING) ((grenades *)player1->weaponsel)->onownerdies();
     if(!force) addmsg(SV_EDITMODE, "ri", editing);
 }