mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-29 00:11:14 +02:00
CComponentsHeader: ensure clean object on reinit
Items were destroyed with simple call of delete but not removed from item collection. removeCCItem() does this and destroys item objects too.
This commit is contained in:
@@ -86,6 +86,7 @@ void CComponentsHeader::initVarHeader( const int& x_pos, const int& y_pos, const
|
||||
fb_pixel_t color_shadow)
|
||||
{
|
||||
cc_item_type = CC_ITEMTYPE_FRM_HEADER;
|
||||
clear();
|
||||
cc_txt_save_screen = false;
|
||||
x = x_old = x_pos;
|
||||
y = y_old = y_pos;
|
||||
@@ -203,10 +204,8 @@ void CComponentsHeader::initIcon()
|
||||
//init cch_icon_obj only if an icon available
|
||||
if (cch_icon_name.empty()) {
|
||||
cch_icon_w = 0;
|
||||
if (cch_icon_obj){
|
||||
delete cch_icon_obj;
|
||||
cch_icon_obj = NULL;
|
||||
}
|
||||
if (cch_icon_obj)
|
||||
removeCCItem(cch_icon_obj);
|
||||
return;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user