Skip to content

Commit f904284

Browse files
committed
core/desktopentry: fix locale matching
1 parent 84c4146 commit f904284

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/core/desktopentry.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,14 @@ struct Locale {
6161

6262
[[nodiscard]] int matchScore(const Locale& other) const {
6363
if (this->language != other.language) return 0;
64-
auto territoryMatches = !this->territory.isEmpty() && this->territory == other.territory;
65-
auto modifierMatches = !this->modifier.isEmpty() && this->modifier == other.modifier;
64+
65+
if (!other.modifier.isEmpty() && this->modifier != other.modifier) return 0;
66+
if (!other.territory.isEmpty() && this->territory != other.territory) return 0;
6667

6768
auto score = 1;
68-
if (territoryMatches) score += 2;
69-
if (modifierMatches) score += 1;
69+
70+
if (!other.territory.isEmpty()) score += 2;
71+
if (!other.modifier.isEmpty()) score += 1;
7072

7173
return score;
7274
}

0 commit comments

Comments
 (0)