From 23b8cf2ebb2c6859557417dab8ed1001cfd1bb4b Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Tue, 19 Oct 2010 10:02:44 +0000 Subject: [PATCH] fix close & osd git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@846 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/386afa124547b37d72f18aa8eb6b05471518ac63 Author: Jacek Jendrzej Date: 2010-10-19 (Tue, 19 Oct 2010) --- src/driver/pictureviewer/bmp.cpp | 1 + src/gui/eventlist.cpp | 3 +++ src/timerd/timermanager.cpp | 1 + 3 files changed, 5 insertions(+) diff --git a/src/driver/pictureviewer/bmp.cpp b/src/driver/pictureviewer/bmp.cpp index 8c56bd379..4c707462d 100644 --- a/src/driver/pictureviewer/bmp.cpp +++ b/src/driver/pictureviewer/bmp.cpp @@ -151,6 +151,7 @@ int fh_bmp_load(const char *name,unsigned char **buffer,int* xp,int* yp) if(tbuffer==NULL) { printf("Error: malloc\n"); + close(fd); return (FH_ERROR_MALLOC); } unsigned char c1,c2; diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index 9f03148d9..1f20b9e30 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -716,6 +716,9 @@ void EventList::paintItem(unsigned int pos, t_channel_id channel_idI) { color = COL_MENUCONTENTSELECTED; bgcolor = COL_MENUCONTENTSELECTED_PLUS_0; + if(RADIUS_LARGE) + frameBuffer->paintBoxRel(x, ypos, width- 15, fheight, COL_MENUCONTENT_PLUS_0, 0); + } else if (liststart+pos == current_event ) { diff --git a/src/timerd/timermanager.cpp b/src/timerd/timermanager.cpp index ef57927a1..a5154893f 100644 --- a/src/timerd/timermanager.cpp +++ b/src/timerd/timermanager.cpp @@ -74,6 +74,7 @@ void CTimerManager::Init(void) int ret = ioctl(fd, IOC_VFD_GET_WAKEUP, &wk); if(ret >= 0) wakeup = ((wk.source == WAKEUP_SOURCE_TIMER) /* || (wk.source == WAKEUP_SOURCE_PWLOST)*/); + close(fd); } printf("[timerd] wakeup from standby: %s\n", wakeup ? "yes" : "no"); if(wakeup)