From 15e3b43d09604dc9939b10f4d03ebdb8afec8f56 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 30 Jan 2011 13:18:05 +0000 Subject: [PATCH] fix merge error in last commit git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1091 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/3ac8045a6b698d76b242e76f2a551f36342e84dc Author: Stefan Seyfried Date: 2011-01-30 (Sun, 30 Jan 2011) ------------------ This commit was generated by Migit --- src/timerd/timermanager.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/timerd/timermanager.cpp b/src/timerd/timermanager.cpp index 5f42d5828..e8dd040e5 100644 --- a/src/timerd/timermanager.cpp +++ b/src/timerd/timermanager.cpp @@ -83,14 +83,13 @@ void CTimerManager::Init(void) printf("[timerd] wakeup from standby: %s\n", wakeup ? "yes" : "no"); if(wakeup){ creat("/tmp/.wakeup", 0); -#endif - }else{ const char *neutrino_leave_deepstandby_script = CONFIGDIR "/deepstandby.off"; printf("[%s] executing %s\n",__FILE__ ,neutrino_leave_deepstandby_script); if (system(neutrino_leave_deepstandby_script) != 0) perror( neutrino_leave_deepstandby_script ); } +#endif loadRecordingSafety(); //thread starten