From eddc269e14ee1f422072a84413d689a9d7fd0573 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 13 Jan 2014 00:29:53 +0200
Subject: Drop redundant null checks.

---
 display.c     | 2 +-
 displaybase.c | 3 +--
 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() {
-- 
cgit v1.2.3