diff options
| author | kamel5 <vdr.kamel5 (at) gmx (dot) net> | 2019-01-14 15:41:07 +0100 |
|---|---|---|
| committer | kamel5 <vdr.kamel5 (at) gmx (dot) net> | 2019-01-19 15:53:23 +0100 |
| commit | 27b929b6fcb749492a8068c51dfaffc5a5a51d6a (patch) | |
| tree | 57115df3bebc1e26e6b278f76856421d4650ce13 /displaychannel.c | |
| parent | d7c276923ee915836e4712b2de53053e9c6bafaf (diff) | |
| download | skin-lcarsng-27b929b6fcb749492a8068c51dfaffc5a5a51d6a.tar.gz skin-lcarsng-27b929b6fcb749492a8068c51dfaffc5a5a51d6a.tar.bz2 | |
Cancel(3) in cLCARSNGDisplayChannel::~cLCARSNGDisplayChannel
Diffstat (limited to 'displaychannel.c')
| -rw-r--r-- | displaychannel.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/displaychannel.c b/displaychannel.c index 2f2dafb..a0c51a9 100644 --- a/displaychannel.c +++ b/displaychannel.c @@ -101,10 +101,10 @@ cLCARSNGDisplayChannel::cLCARSNGDisplayChannel(bool WithInfo):cThread("LCARS Dis xs = 0; - dsyslog ("%s %s %d Lineheight %i\n", __FILE__, __func__, __LINE__, lineHeight); - dsyslog ("%s %s %d Iconheight %i\n", __FILE__, __func__, __LINE__, iconHeight); - dsyslog ("%s %s %d Ellipse AU %ix%i\n", __FILE__, __func__, __LINE__, (xc01 - 1 - xc00), (yc12 - 1 - yc08)); - dsyslog ("%s %s %d Ellipse AO %ix%i\n", __FILE__, __func__, __LINE__, (xc01 - 1 - xc00), (yc00m - 1 - yc0B)); +// dsyslog ("%s %s %d Lineheight %i\n", __FILE__, __func__, __LINE__, lineHeight); +// dsyslog ("%s %s %d Iconheight %i\n", __FILE__, __func__, __LINE__, iconHeight); +// dsyslog ("%s %s %d Ellipse AU %ix%i\n", __FILE__, __func__, __LINE__, (xc01 - 1 - xc00), (yc12 - 1 - yc08)); +// dsyslog ("%s %s %d Ellipse AO %ix%i\n", __FILE__, __func__, __LINE__, (xc01 - 1 - xc00), (yc00m - 1 - yc0B)); int y1 = withInfo ? yc12 : yc02; int y0 = cOsd::OsdTop() + (Setup.ChannelInfoPos ? 0 : cOsd::OsdHeight() - y1); @@ -168,10 +168,11 @@ cLCARSNGDisplayChannel::cLCARSNGDisplayChannel(bool WithInfo):cThread("LCARS Dis cLCARSNGDisplayChannel::~cLCARSNGDisplayChannel() { - Cancel(-1); +// Cancel(3); delete tallFont; delete tinyFont; delete osd; + Cancel(3); cDevice::PrimaryDevice()->ScaleVideo(cRect::Null); } |