mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 18:31:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

progressbar: do not do stupid things if passed invalid values

Browse Source
This commit is contained in:
Stefan Seyfried
2012-03-08 21:01:12 +01:00
parent 2e06c23b99
commit d0e13f3036
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/widget/progressbar.cpp
View File

@@ -106,7 +106,7 @@ void CProgressBar::paintProgressBar2(const int pos_x,
} }
void CProgressBar::realpaint(const int pos_x, const int pos_y, void CProgressBar::realpaint(const int pos_x, const int pos_y,
const int value, const int max_value, const int val, const int max_value,
const fb_pixel_t activebar_col, const fb_pixel_t activebar_col,
const fb_pixel_t passivebar_col, const fb_pixel_t passivebar_col,
const fb_pixel_t backgroundbar_col, const fb_pixel_t backgroundbar_col,
@@ -120,6 +120,14 @@ void CProgressBar::realpaint(const int pos_x, const int pos_y,
bl_changed = g_settings.progressbar_color; bl_changed = g_settings.progressbar_color;
reset(); reset();
} }
/* stupid callers give invalid values like "-1"... */
int value = val;
if (value < 0)
value = 0;
if (value > max_value)
value = max_value;
// set colors // set colors
fb_pixel_t active_col = activebar_col != 0 ? activebar_col : COL_INFOBAR_PLUS_7; fb_pixel_t active_col = activebar_col != 0 ? activebar_col : COL_INFOBAR_PLUS_7;
fb_pixel_t passive_col = passivebar_col != 0 ? passivebar_col : COL_INFOBAR_PLUS_3; fb_pixel_t passive_col = passivebar_col != 0 ? passivebar_col : COL_INFOBAR_PLUS_3;