From 006ee9e5281e011aca0e2b3b40d0c604e6adcde4 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Fillion-Robin Date: Mon, 15 Jan 2024 22:10:39 -0500 Subject: [PATCH] BUG: Ensure language combobox shows default language This change ensures the fix integrated through commontk/CTK#1179 (BUG: Fix ctkLanguageComboBox normalizing default language and selection) is effective. --- LanguageTools/LanguageTools.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/LanguageTools/LanguageTools.py b/LanguageTools/LanguageTools.py index dc86b0f..6e8467d 100644 --- a/LanguageTools/LanguageTools.py +++ b/LanguageTools/LanguageTools.py @@ -367,7 +367,10 @@ def updateGUIFromSettings(self): self.refreshLanguageList() wasBlocked = self.ui.languageSelector.blockSignals(True) - self.ui.languageSelector.currentLanguage = settings.value("language") + # Ensure older settings with an empty and invalid "language" entry are ignored by + # explicitly checking for an empty value. + if settings.contains("language") and settings.value("language") != "": + self.ui.languageSelector.currentLanguage = settings.value("language") self.ui.languageSelector.blockSignals(wasBlocked) self.logic.customLreleasePath = self.ui.lreleasePathLineEdit.currentPath