mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-11 07:30:57 +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
------------------
Branch: ni/coolstream
Commit: c68ae57571
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-06-15 11:07:32 +02:00
parent 5a43934c6b 8b3c5e2fab
commit faa10f0ed6
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_item_progressbar.cpp
View File

@@ -61,10 +61,10 @@ CProgressBar::CProgressBar( const int x_pos,
cc_item_type = CC_ITEMTYPE_PROGRESSBAR;
//CComponents
x = x_pos;
y = y_pos;
width = w;
height = h;
x = x_old = x_pos;
y = y_old = y_pos;
width = width_old = w;
height = height_old = h;
col_frame = color_frame;
col_body = color_body;
@@ -202,6 +202,7 @@ void CProgressBarCache::pbcClear()
if ((*it)->pbc_passive)
free((*it)->pbc_passive);
delete (*it);
(*it) = NULL;
}
pbCache.clear();
}