From: Vsevolod Stakhov <vsevolod@rspamd.com>
Date: Wed, 2 Nov 2022 21:45:00 +0000 (+0000)
Subject: [Minor] Move checks to the correct branch
X-Git-Tag: 3.5~224
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e9794d53f3882ec44fba535a14249058d552d248;p=rspamd.git

[Minor] Move checks to the correct branch
---

diff --git a/src/libmime/scan_result.c b/src/libmime/scan_result.c
index 137f30ca0..e160d34a7 100644
--- a/src/libmime/scan_result.c
+++ b/src/libmime/scan_result.c
@@ -319,9 +319,6 @@ insert_metric_result (struct rspamd_task *task,
 		}
 		else {
 			if (sdef) {
-				max_shots = sdef->nshots;
-			}
-			else {
 				if (sdef->groups) {
 					PTR_ARRAY_FOREACH(sdef->groups, i, gr) {
 						if (gr->flags & RSPAMD_SYMBOL_GROUP_ONE_SHOT) {
@@ -329,9 +326,11 @@ insert_metric_result (struct rspamd_task *task,
 						}
 					}
 				}
-				else {
-					max_shots = task->cfg->default_max_shots;
-				}
+
+				max_shots = MIN(max_shots, sdef->nshots);
+			}
+			else {
+				max_shots = task->cfg->default_max_shots;
 			}
 		}