From 1c3c98b949a4b4cd38cfd0b5172389002db225e6 Mon Sep 17 00:00:00 2001 From: Michael Gordeev Date: Fri, 8 Jun 2018 12:10:57 +0300 Subject: [PATCH] Region retrieving fix --- FoxTube/Home.xaml.cs | 11 ++++++++++- FoxTube/MainPage.xaml.cs | 9 ++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/FoxTube/Home.xaml.cs b/FoxTube/Home.xaml.cs index e391871..a9dd6d5 100644 --- a/FoxTube/Home.xaml.cs +++ b/FoxTube/Home.xaml.cs @@ -37,7 +37,16 @@ namespace FoxTube { #region Vairables declaring VideoGrid videoGrid = new VideoGrid(); - string reg = (ApplicationData.Current.LocalSettings.Values["region"] as string).ToUpper().Remove(0, 3); + string reg; + + try + { + reg = (ApplicationData.Current.LocalSettings.Values["region"] as string).ToUpper().Remove(0, 3); + } + catch(ArgumentOutOfRangeException) + { + reg = (ApplicationData.Current.LocalSettings.Values["region"] as string).ToUpper(); + } #endregion pivot.Items.Clear(); diff --git a/FoxTube/MainPage.xaml.cs b/FoxTube/MainPage.xaml.cs index 544ca2d..957493b 100644 --- a/FoxTube/MainPage.xaml.cs +++ b/FoxTube/MainPage.xaml.cs @@ -511,7 +511,14 @@ namespace FoxTube searchListRequest.Q = keyword; searchListRequest.SafeSearch = (SearchResource.ListRequest.SafeSearchEnum)(int)settings.Values["safeSearch"]; searchListRequest.MaxResults = 25; - searchListRequest.RelevanceLanguage = settings.Values["region"].ToString().Remove(2).ToLower(); + try + { + searchListRequest.RelevanceLanguage = settings.Values["region"].ToString().Remove(2).ToLower(); + } + catch(ArgumentOutOfRangeException) + { + searchListRequest.RelevanceLanguage = settings.Values["region"].ToString().ToLower(); + } var response = await searchListRequest.ExecuteAsync();