From 27a8538a779d0ffbb60991ce533bd0504a626f39 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:28:38 +0200
Subject: Drop now redundant cTxtStatus destructor cleanup, clean up storage in
 Stop().

---
 osdteletext.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/osdteletext.c b/osdteletext.c
index 5f2b7a6..2720ca1 100644
--- a/osdteletext.c
+++ b/osdteletext.c
@@ -114,12 +114,6 @@ cPluginTeletextosd::cPluginTeletextosd(void)
 cPluginTeletextosd::~cPluginTeletextosd()
 {
    // Clean up after yourself!
-   if (txtStatus)
-      delete txtStatus;
-   if(storage) {
-     storage->cleanUp();
-     delete storage;
-   }
 }
 
 const char *cPluginTeletextosd::CommandLineHelp(void)
@@ -201,6 +195,10 @@ bool cPluginTeletextosd::Start(void)
 void cPluginTeletextosd::Stop(void)
 {
    DELETENULL(txtStatus);
+   if (storage) {
+      storage->cleanUp();
+      DELETENULL(storage);
+   }
 }
 
 void cPluginTeletextosd::initTexts() {
-- 
cgit v1.2.3