Merge remote-tracking branch 'tuxbox/master'

* needs compile fixes
* needs additional tests, of course :-)
This commit is contained in:
Stefan Seyfried
2016-10-22 11:37:40 +02:00
346 changed files with 13372 additions and 6088 deletions

View File

@@ -109,8 +109,8 @@ void CVolume::setVolume(const neutrino_msg_t key)
hideVolscale();
showVolscale();
neutrino_msg_data_t data;
uint64_t timeoutEnd;
neutrino_msg_data_t data = 0;
uint64_t timeoutEnd = 0;
int vol = g_settings.current_volume;
do {