From 336ddf75b64201514e51de192a92326239c77b4c Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 18 May 2014 20:41:42 +0200 Subject: [PATCH] CComponents/CComponentsItem: simplify statement --- src/gui/components/cc_item.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/gui/components/cc_item.cpp b/src/gui/components/cc_item.cpp index 1db1cb436..466bec66d 100644 --- a/src/gui/components/cc_item.cpp +++ b/src/gui/components/cc_item.cpp @@ -137,13 +137,10 @@ void CComponentsItem::hide(bool no_restore) //erase or paint over rendered objects void CComponentsItem::kill(const fb_pixel_t& bg_color, bool ignore_parent) { - if(bg_color || cc_parent == NULL){ + if(cc_parent == NULL){ CComponents::kill(bg_color); - return; - } - - if (cc_parent){ - if(bg_color || ignore_parent) + }else{ + if(ignore_parent) CComponents::kill(bg_color); else CComponents::kill(cc_parent->getColorBody());