summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2014-01-13 00:29:53 +0200
committerVille Skyttä <ville.skytta@iki.fi>2014-01-13 00:36:52 +0200
commiteddc269e14ee1f422072a84413d689a9d7fd0573 (patch)
tree78e4942953ad47aa58b8385984df75d586841103
parent27a8538a779d0ffbb60991ce533bd0504a626f39 (diff)
downloadvdr-plugin-osdteletext-eddc269e14ee1f422072a84413d689a9d7fd0573.tar.gz
vdr-plugin-osdteletext-eddc269e14ee1f422072a84413d689a9d7fd0573.tar.bz2
Drop redundant null checks.
-rw-r--r--display.c2
-rw-r--r--displaybase.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/display.c b/display.c
index 2669cd9..a3b3a58 100644
--- a/display.c
+++ b/display.c
@@ -183,7 +183,7 @@ cDisplay4BPPHalf::cDisplay4BPPHalf(int x0, int y0, int width, int height, bool u
}
void cDisplay4BPPHalf::InitOSD() {
- if (osd) delete osd;
+ delete osd;
osd = cOsdProvider::NewOsd(OsdX0, OsdY0);
if (!osd) return;
diff --git a/displaybase.c b/displaybase.c
index 03c15b7..a65b5d9 100644
--- a/displaybase.c
+++ b/displaybase.c
@@ -29,8 +29,7 @@ cDisplay::cDisplay(int width, int height)
}
cDisplay::~cDisplay() {
- if (osd) delete osd;
- osd=NULL;
+ DELETENULL(osd);
}
void cDisplay::InitScaler() {