From ab1e642ef1fe5cc95041d3ca98c5f4ab47bfcdfb Mon Sep 17 00:00:00 2001 From: Jean-Marc Date: Sat, 12 Sep 2015 19:01:18 +0200 Subject: [PATCH] Fix logic of method The last return statement was unreachable Coverity issue 102063. --- src/insets/InsetBox.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp index c5bd4ee446..2d0cf53c54 100644 --- a/src/insets/InsetBox.cpp +++ b/src/insets/InsetBox.cpp @@ -204,21 +204,21 @@ ColorCode InsetBox::backgroundColor(PainterInfo const &) const // we only support background color for 3 types if (params_.type != "Shaded" && params_.type != "Frameless" && params_.type != "Boxed") return getLayout().bgcolor(); + if (params_.type == "Shaded") { // FIXME: This hardcoded color is a hack! if (buffer().params().boxbgcolor == lyx::rgbFromHexName("#ff0000")) return getLayout().bgcolor(); - + ColorCode c = lcolor.getFromLyXName("boxbgcolor"); if (c == Color_none) return getLayout().bgcolor(); return c; - } else { - if (params_.backgroundcolor == "none") - return getLayout().bgcolor(); - ColorCode boxbackground = lcolor.getFromLaTeXName(params_.backgroundcolor); - return boxbackground; } + + if (params_.backgroundcolor != "none") + return lcolor.getFromLaTeXName(params_.backgroundcolor); + return getLayout().bgcolor(); } -- 2.39.2