From c7feec0a600bfbfbd62b9ed88aa47f19a232ec69 Mon Sep 17 00:00:00 2001
From: Roman Fomin <rfomin@gmail.com>
Date: Wed, 4 Dec 2024 22:15:19 +0700
Subject: [PATCH] fix carousel switching duration (#2071)

* apply Ceski patch
---
 src/st_carousel.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/st_carousel.c b/src/st_carousel.c
index 2da588c0..a0fabd5c 100644
--- a/src/st_carousel.c
+++ b/src/st_carousel.c
@@ -144,7 +144,8 @@ void ST_UpdateCarousel(player_t *player)
         return;
     }
 
-    if (player->switching == weapswitch_none)
+    if (player->switching == weapswitch_none
+        && player->pendingweapon == wp_nochange)
     {
         --duration;
     }