mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Stefan Seyfried
2015-12-15 17:29:18 +01:00
parent 5a7d91c77d 4b7b43f028
commit 2d949bce16
35 changed files with 268 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/filebrowser.cpp
View File

@@ -679,6 +679,7 @@ bool CFileBrowser::exec(const char * const dirname)
}
}
else if (msg == NeutrinoMessages::STANDBY_ON ||
msg == NeutrinoMessages::LEAVE_ALL ||
msg == NeutrinoMessages::SHUTDOWN ||
msg == NeutrinoMessages::SLEEPTIMER)
{
@@ -958,6 +959,7 @@ bool CFileBrowser::playlist_manager(CFileList &playlist, unsigned int playing)
loop = false;
}
else if (msg == NeutrinoMessages::STANDBY_ON ||
msg == NeutrinoMessages::LEAVE_ALL ||
msg == NeutrinoMessages::SHUTDOWN ||
msg == NeutrinoMessages::SLEEPTIMER)
{