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

fix merge error in last commit

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1091 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
seife
2011-01-30 13:18:05 +00:00
parent 6f3072fe42
commit 3ac8045a6b
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/timerd/timermanager.cpp
View File

@@ -83,14 +83,13 @@ void CTimerManager::Init(void)
printf("[timerd] wakeup from standby: %s\n", wakeup ? "yes" : "no"); printf("[timerd] wakeup from standby: %s\n", wakeup ? "yes" : "no");
if(wakeup){ if(wakeup){
creat("/tmp/.wakeup", 0); creat("/tmp/.wakeup", 0);
#endif
}else{ }else{
const char *neutrino_leave_deepstandby_script = CONFIGDIR "/deepstandby.off"; const char *neutrino_leave_deepstandby_script = CONFIGDIR "/deepstandby.off";
printf("[%s] executing %s\n",__FILE__ ,neutrino_leave_deepstandby_script); printf("[%s] executing %s\n",__FILE__ ,neutrino_leave_deepstandby_script);
if (system(neutrino_leave_deepstandby_script) != 0) if (system(neutrino_leave_deepstandby_script) != 0)
perror( neutrino_leave_deepstandby_script ); perror( neutrino_leave_deepstandby_script );
} }
#endif
loadRecordingSafety(); loadRecordingSafety();
//thread starten //thread starten