Merge branch 'master' into pu/mp

Origin commit data
------------------
Commit: 05e8d727bd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-28 (Sun, 28 May 2017)
This commit is contained in:
Jacek Jendrzej
2017-05-28 22:30:05 +02:00
16 changed files with 68 additions and 64 deletions

View File

@@ -232,8 +232,10 @@ 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)
if (cch_icon_obj){
removeCCItem(cch_icon_obj);
cch_icon_obj = NULL;
}
return;
}