mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 17:31:11 +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
------------------
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()
This commit is contained in:
Jacek Jendrzej
2021-11-06 20:34:39 +01:00
committed by vanhofen
parent 4a525fbb8a
commit 4150a3cd54
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -157,7 +157,10 @@ void CComponentsButton::initIcon()
int y_icon = height/2 - h_icon/2;
//init icon object
if (cc_btn_icon_obj == NULL){
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);
@@ -165,6 +168,7 @@ void CComponentsButton::initIcon()
cc_btn_icon_obj->setHeight(h_icon, true);
cc_btn_icon_obj->setPicture(cc_btn_icon);
}
}
void CComponentsButton::initCaption()
{