From: Juergen Spitzmueller <spitz@lyx.org>
Date: Mon, 18 May 2015 11:12:26 +0000 (+0200)
Subject: GuiBox: do not rely on count (as explained on lyx-devel)
X-Git-Tag: 2.2.0alpha1~766
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=7d67e94cd0827a13c42f13c4e5a6e96239927f33;p=features.git

GuiBox: do not rely on count (as explained on lyx-devel)
---

diff --git a/src/frontends/qt4/GuiBox.cpp b/src/frontends/qt4/GuiBox.cpp
index adc107e215..b34bd68d06 100644
--- a/src/frontends/qt4/GuiBox.cpp
+++ b/src/frontends/qt4/GuiBox.cpp
@@ -246,8 +246,8 @@ void GuiBox::on_frameColorCO_currentIndexChanged(int index)
 {
 	// if there is a non-black frame color the background cannot be uncolored
 	// therefore remove the entry "none" in this case
+	int const n = backgroundColorCO->findData("none");
 	if (index != frameColorCO->findData("black")) {
-		int const n = backgroundColorCO->findData("none");
 		if (n != -1) {
 			if (backgroundColorCO->currentIndex() == n)
 				backgroundColorCO->setCurrentIndex(
@@ -255,7 +255,7 @@ void GuiBox::on_frameColorCO_currentIndexChanged(int index)
 			backgroundColorCO->removeItem(n);
 		}
 	} else {
-		if (backgroundColorCO->count() == color_codes_.count() - 1)
+		if (n == -1)
 			backgroundColorCO->insertItem(0, toqstr(translateIfPossible((lcolor.getGUIName(Color_none)))),
 						      toqstr(lcolor.getLaTeXName(Color_none)));
 	}