Merge remote-tracking branch 'tuxbox/master'

Origin commit data
------------------
Branch: ni/coolstream
Commit: 7497722646
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-01 (Wed, 01 Feb 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2017-02-01 22:03:40 +01:00
45 changed files with 409 additions and 286 deletions

View File

@@ -182,7 +182,7 @@ void CVolume::setVolume(const neutrino_msg_t key)
if (volscale) {
if(vol != g_settings.current_volume) {
vol = g_settings.current_volume;
volscale->repaintVolScale();
volscale->paint();
}
}