CComponentsInfoBox: CComponentsPicture not create when no image to draw

Origin commit data
------------------
Branch: ni/coolstream
Commit: 095c0e1b04
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-04 (Thu, 04 Apr 2013)

Origin message was:
------------------
* CComponentsInfoBox: CComponentsPicture not create when no image to draw

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

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2013-04-04 17:05:32 +02:00
parent 647363ca60
commit e575e91329

View File

@@ -91,6 +91,9 @@ void CComponentsInfoBox::initVarInfobox()
void CComponentsInfoBox::paintPicture() void CComponentsInfoBox::paintPicture()
{ {
if (pic_name == "")
return;
//init and set icon paint position //init and set icon paint position
if (pic) if (pic)
delete pic; delete pic;
@@ -115,7 +118,7 @@ void CComponentsInfoBox::paint(bool do_save_bg)
x_text = x+fr_thickness+x_offset; x_text = x+fr_thickness+x_offset;
//set text to the left border if picture is not painted //set text to the left border if picture is not painted
if (pic->isPicPainted()){ if ((pic) && (pic->isPicPainted())){
int pic_w = pic->getWidth(); int pic_w = pic->getWidth();
x_text += pic_w+x_offset; x_text += pic_w+x_offset;
} }