mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-11 23:50:58 +02:00
Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4c3002cb26
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-15 (Thu, 15 Jun 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -57,10 +57,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;
|
||||
@@ -198,6 +198,7 @@ void CProgressBarCache::pbcClear()
|
||||
if ((*it)->pbc_passive)
|
||||
free((*it)->pbc_passive);
|
||||
delete (*it);
|
||||
(*it) = NULL;
|
||||
}
|
||||
pbCache.clear();
|
||||
}
|
||||
|
Reference in New Issue
Block a user