Merge branch 'master' into pu/mp

Origin commit data
------------------
Branch: ni/coolstream
Commit: f292ba6b69
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-24 (Mon, 24 Apr 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2017-04-24 21:33:15 +02:00
19 changed files with 63 additions and 63 deletions

View File

@@ -1428,7 +1428,7 @@ void CTimerList::paint()
{
int ypos = y+ theight;
int sb = 2*fheight* listmaxshow;
frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PASSIVE_PLUS_0);
frameBuffer->paintBoxRel(x+ width- 15,ypos, 15, sb, COL_SCROLLBAR_PLUS_0);
unsigned int tmp_max = listmaxshow;
if (!tmp_max)
tmp_max = 1;