mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 10:51:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/gui/components/cc_frm_footer.cpp


Origin commit data
------------------
Commit: c68ae57571
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
This commit is contained in:
vanhofen
2017-06-15 11:07:32 +02:00
parent c35224ff08 922aa2b4e7
commit b162e3d2aa
39 changed files with 430 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/components/cc_frm.cpp
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();