Return first language on error

If unable to match system settings key with list of
languages or regions return first item from list.

Change-Id: I8204fddaabc3159a48dcabbdcf238a63912fb258

diff --git a/Oobe/Oobe.Language/Model/LanguageManger.cs b/Oobe/Oobe.Language/Model/LanguageManger.cs
index f761b2f6f165931fc7369014739efad03353a71f..c347b178af3b0b2f2bf3715e72c172e791ec9d22 100644 (file)
--- a/Oobe/Oobe.Language/Model/LanguageManger.cs
+++ b/Oobe/Oobe.Language/Model/LanguageManger.cs
@@ -42,7 +42,7 @@ namespace Oobe.Language.Model
         {
             get
             {
-                return Languages.Single(s => s.Code == SystemSettings.LocaleLanguage);
+                return Languages.FirstOrDefault(s => s.Code == SystemSettings.LocaleLanguage) ?? Languages.FirstOrDefault();
             }
             set
             {

diff --git a/Oobe/Oobe.Region/Model/RegionManager.cs b/Oobe/Oobe.Region/Model/RegionManager.cs
index 36ce5516e573bfa89dc7ca1948e043bc2359a8b8..46e004c0912d9dca19aae54f6a39cd751166421d 100644 (file)
--- a/Oobe/Oobe.Region/Model/RegionManager.cs
+++ b/Oobe/Oobe.Region/Model/RegionManager.cs
@@ -44,7 +44,7 @@ namespace Oobe.Region.Model
         {
             get
             {
-                return Regions.Single(s => s.CountryCode == SystemSettings.LocaleCountry);
+                return Regions.FirstOrDefault(s => s.CountryCode == SystemSettings.LocaleCountry) ?? Regions.FirstOrDefault();
             }
             set
             {