mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 23:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

cc_frm_button.cpp: dont create cc_btn_icon_obj with empty cc_btn_icon, avoid segfault with doble delete - delete cc_btn_icon_obj and CComponentsForm::clear()

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 07f8d789fa
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2021-11-06 (Sat, 06 Nov 2021)

Origin message was:
------------------
cc_frm_button.cpp: dont create cc_btn_icon_obj with empty cc_btn_icon, avoid segfault with doble delete - delete cc_btn_icon_obj and CComponentsForm::clear()

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2021-11-06 20:34:39 +01:00
committed by vanhofen
parent c3dd94a148
commit 795ae2c4a0
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/components/cc_frm_button.cpp
View File

@@ -157,13 +157,17 @@ void CComponentsButton::initIcon()
int y_icon = height/2 - h_icon/2;
//init icon object
if (cc_btn_icon_obj == NULL){
cc_btn_icon_obj = new CComponentsPicture(fr_thickness, y_icon, cc_btn_icon, this);
cc_btn_icon_obj->SetTransparent(CFrameBuffer::TM_BLACK);
cc_btn_icon_obj->doPaintBg(false);
if(!cc_btn_icon.empty())
{
if (cc_btn_icon_obj == NULL)
{
cc_btn_icon_obj = new CComponentsPicture(fr_thickness, y_icon, cc_btn_icon, this);
cc_btn_icon_obj->SetTransparent(CFrameBuffer::TM_BLACK);
cc_btn_icon_obj->doPaintBg(false);
}
cc_btn_icon_obj->setHeight(h_icon, true);
cc_btn_icon_obj->setPicture(cc_btn_icon);
}
cc_btn_icon_obj->setHeight(h_icon, true);
cc_btn_icon_obj->setPicture(cc_btn_icon);
}
void CComponentsButton::initCaption()