Merge remote-tracking branch 'uncool/cst-next'

This commit is contained in:
Stefan Seyfried
2015-12-15 17:29:18 +01:00
35 changed files with 268 additions and 108 deletions

View File

@@ -820,6 +820,7 @@ int CAudioPlayerGui::show()
else if (msg == NeutrinoMessages::RECORD_START ||
msg == NeutrinoMessages::ZAPTO ||
msg == NeutrinoMessages::STANDBY_ON ||
msg == NeutrinoMessages::LEAVE_ALL ||
msg == NeutrinoMessages::SHUTDOWN ||
((msg == NeutrinoMessages::SLEEPTIMER) && !data))
{