Merge branch 'master' into pu/mp

This commit is contained in:
Jacek Jendrzej
2017-06-15 12:32:31 +02:00
43 changed files with 473 additions and 295 deletions

View File

@@ -185,11 +185,10 @@ void CComponentsForm::clear()
return;
for(size_t i=0; i<v_cc_items.size(); i++) {
CComponentsItem *item = v_cc_items[i];
if (item){
dprintf(DEBUG_DEBUG, "[CComponentsForm] %s... delete form cc-item %d of %d (type=%d)\taddress = %p\n", __func__, (int)i+1, (int)v_cc_items.size(), item->getItemType(), item);
delete item;
item = NULL;
if (v_cc_items[i]){
dprintf(DEBUG_DEBUG, "[CComponentsForm] %s... delete form cc-item %d of %d (type=%d)\taddress = %p\n", __func__, (int)i+1, (int)v_cc_items.size(), v_cc_items[i]->getItemType(), v_cc_items[i]);
delete v_cc_items[i];
v_cc_items[i] = NULL;
}
}
v_cc_items.clear();