From 470d83de1efaf337b6b4c320e95dd465be7bd0c7 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Thu, 22 Feb 2018 00:15:07 -0500 Subject: [PATCH] Fix bug #10880. --- src/frontends/qt4/GuiPrefs.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp index e93c6b7171..f1b817a451 100644 --- a/src/frontends/qt4/GuiPrefs.cpp +++ b/src/frontends/qt4/GuiPrefs.cpp @@ -287,8 +287,8 @@ static void setComboxFont(QComboBox * cb, string const & family, // We count in reverse in order to prefer the Xft foundry for (int i = cb->count(); --i >= 0;) { - string name, foundry; - parseFontName(cb->itemText(i), name, foundry); + string name, fnt_foundry; + parseFontName(cb->itemText(i), name, fnt_foundry); if (compare_ascii_no_case(name, family) == 0) { cb->setCurrentIndex(i); return; @@ -301,9 +301,9 @@ static void setComboxFont(QComboBox * cb, string const & family, // We count in reverse in order to prefer the Xft foundry for (int i = cb->count(); --i >= 0; ) { - string name, foundry; - parseFontName(cb->itemText(i), name, foundry); - if (compare_ascii_no_case(name, foundry) == 0) { + string name, fnt_foundry; + parseFontName(cb->itemText(i), name, fnt_foundry); + if (compare_ascii_no_case(name, fnt_foundry) == 0) { cb->setCurrentIndex(i); return; } -- 2.39.2