Check for an empty installer locale for both locale preference and re…

…quirement cases
microsoft · May 4, 2024 · 3e0765f · 3e0765f
1 parent 2979fd8
commit 3e0765f
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/AppInstallerCLICore/Workflows/ManifestComparator.cpp b/src/AppInstallerCLICore/Workflows/ManifestComparator.cpp
@@ -645,6 +645,12 @@ namespace AppInstaller::CLI::Workflow
 
             InapplicabilityFlags IsApplicable(const Manifest::ManifestInstaller& installer) override
             {
+                // We have to assume an unknown installer locale will match our installed locale, or the entire catalog would stop working for upgrade.
+                if (installer.Locale.empty())
+                {
+                    return InapplicabilityFlags::None;
+                }
+
                 InapplicabilityFlags inapplicableFlag = m_isInstalledLocale ? InapplicabilityFlags::InstalledLocale : InapplicabilityFlags::Locale;
 
                 if (!m_requirement.empty())
@@ -665,9 +671,7 @@ namespace AppInstaller::CLI::Workflow
                     // For installed locale preference, check at least compatible match for preference
                     for (auto const& preferredLocale : m_preference)
                     {
-                        // We have to assume an unknown installer locale will match our installed locale, or the entire catalog would stop working for upgrade.
-                        if (installer.Locale.empty() ||
-                            Locale::GetDistanceOfLanguage(preferredLocale, installer.Locale) >= Locale::MinimumDistanceScoreAsCompatibleMatch)
+                        if (Locale::GetDistanceOfLanguage(preferredLocale, installer.Locale) >= Locale::MinimumDistanceScoreAsCompatibleMatch)
                         {
                             return InapplicabilityFlags::None;
                         }