Skip to content

Commit 08e548f

Browse files
committed
Fixed #469 - fixed all string value conditions
1 parent 147eb3f commit 08e548f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

core/AlertEvaluator.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -343,11 +343,11 @@ bool AlertRule::match(const DxSpot &spot) const
343343
&& (sourceMap & SpotAlert::DXSPOT)
344344
&& (dxCountry == 0 || dxCountry == spot.dxcc.dxcc)
345345
&& (spot.status & dxLogStatusMap)
346-
&& (mode == "*" || mode.contains("|" + spot.modeGroupString))
346+
&& (mode == "*" || (!spot.modeGroupString.isEmpty() && mode.contains("|" + spot.modeGroupString)))
347347
&& (band == "*" || (!spot.band.isEmpty() && band.contains("|" + spot.band)))
348348
&& (spotterCountry == 0 || spotterCountry == spot.dxcc_spotter.dxcc )
349-
&& (dxContinent == "*" || dxContinent.contains("|" + spot.dxcc.cont))
350-
&& (spotterContinent == "*" || spotterContinent.contains("|" + spot.dxcc_spotter.cont))
349+
&& (dxContinent == "*" || (!spot.dxcc.cont.isEmpty() && dxContinent.contains("|" + spot.dxcc.cont)))
350+
&& (spotterContinent == "*" || (!spot.dxcc_spotter.cont.isEmpty() && spotterContinent.contains("|" + spot.dxcc_spotter.cont)))
351351
&& (dxMember == QStringList("*") || spot.memberList2Set().intersects(dxMemberSet))
352352
)
353353
{

0 commit comments

Comments
 (0)