From 081942bc68c2ddca4533279ba872d409a266344a Mon Sep 17 00:00:00 2001 From: Dan Cooper Date: Fri, 6 May 2016 16:02:41 +0200 Subject: [PATCH] fixed: Language is always reset to English --- EmberMediaManager/dlgSettings.vb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/EmberMediaManager/dlgSettings.vb b/EmberMediaManager/dlgSettings.vb index 00830d7b9..566b64493 100644 --- a/EmberMediaManager/dlgSettings.vb +++ b/EmberMediaManager/dlgSettings.vb @@ -3312,7 +3312,7 @@ Public Class dlgSettings cbMovieScraperCertLang.SelectedIndex = 0 ElseIf Not String.IsNullOrEmpty(.MovieScraperCertLang) Then Dim tLanguage As CertLanguages = APIXML.CertLanguagesXML.Language.FirstOrDefault(Function(l) l.abbreviation = .MovieScraperCertLang) - If tLanguage IsNot Nothing AndAlso tLanguage.name IsNot Nothing AndAlso String.IsNullOrEmpty(tLanguage.name) Then + If tLanguage IsNot Nothing AndAlso tLanguage.name IsNot Nothing AndAlso Not String.IsNullOrEmpty(tLanguage.name) Then cbMovieScraperCertLang.Text = tLanguage.name Else cbMovieScraperCertLang.SelectedIndex = 0 @@ -3331,7 +3331,7 @@ Public Class dlgSettings If cbMovieGeneralLang.Items.Count > 0 Then If Not String.IsNullOrEmpty(.MovieGeneralLanguage) Then Dim tLanguage As TVDBLanguagesLanguage = .TVGeneralLanguages.Language.FirstOrDefault(Function(l) l.abbreviation = .MovieGeneralLanguage) - If tLanguage IsNot Nothing AndAlso tLanguage.name IsNot Nothing AndAlso String.IsNullOrEmpty(tLanguage.name) Then + If tLanguage IsNot Nothing AndAlso tLanguage.name IsNot Nothing AndAlso Not String.IsNullOrEmpty(tLanguage.name) Then cbMovieGeneralLang.Text = tLanguage.name Else cbMovieGeneralLang.Text = .TVGeneralLanguages.Language.FirstOrDefault(Function(l) l.abbreviation = "en").name @@ -3353,7 +3353,7 @@ Public Class dlgSettings cbTVScraperShowCertLang.SelectedIndex = 0 ElseIf Not String.IsNullOrEmpty(.TVScraperShowCertLang) Then Dim tLanguage As CertLanguages = APIXML.CertLanguagesXML.Language.FirstOrDefault(Function(l) l.abbreviation = .TVScraperShowCertLang) - If tLanguage IsNot Nothing AndAlso tLanguage.name IsNot Nothing AndAlso String.IsNullOrEmpty(tLanguage.name) Then + If tLanguage IsNot Nothing AndAlso tLanguage.name IsNot Nothing AndAlso Not String.IsNullOrEmpty(tLanguage.name) Then cbTVScraperShowCertLang.Text = tLanguage.name Else cbTVScraperShowCertLang.SelectedIndex = 0 @@ -3372,7 +3372,7 @@ Public Class dlgSettings If cbTVGeneralLang.Items.Count > 0 Then If Not String.IsNullOrEmpty(.TVGeneralLanguage) Then Dim tLanguage As TVDBLanguagesLanguage = .TVGeneralLanguages.Language.FirstOrDefault(Function(l) l.abbreviation = .TVGeneralLanguage) - If tLanguage IsNot Nothing AndAlso tLanguage.name IsNot Nothing AndAlso String.IsNullOrEmpty(tLanguage.name) Then + If tLanguage IsNot Nothing AndAlso tLanguage.name IsNot Nothing AndAlso Not String.IsNullOrEmpty(tLanguage.name) Then cbTVGeneralLang.Text = tLanguage.name Else cbTVGeneralLang.Text = .TVGeneralLanguages.Language.FirstOrDefault(Function(l) l.abbreviation = "en").name