From f71889cd4de662eb29d706f8659e86d13a076fd2 Mon Sep 17 00:00:00 2001
From: Jochen Dolze <vdr@dolze.de>
Date: Thu, 17 May 2012 12:48:45 +0200
Subject: Fixed warnings from cppcheck Added setup menu entry to prevent
 deferred shutdown Added many logos from contributors

---
 plugin/markad.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'plugin/markad.cpp')

diff --git a/plugin/markad.cpp b/plugin/markad.cpp
index 7dc97d1..cfd9ba2 100644
--- a/plugin/markad.cpp
+++ b/plugin/markad.cpp
@@ -26,6 +26,7 @@ cPluginMarkAd::cPluginMarkAd(void)
     statusMonitor=NULL;
     bindir=strdup(DEF_BINDIR);
     logodir=strdup(DEF_LOGODIR);
+    title[0]=0;
 
     setup.ProcessDuring=true;
     setup.whileRecording=true;
@@ -39,6 +40,7 @@ cPluginMarkAd::cPluginMarkAd(void)
     setup.Log2Rec=false;
     setup.LogoOnly=true;
     setup.SaveInfo=false;
+    setup.DeferredShutdown=true;
 }
 
 cPluginMarkAd::~cPluginMarkAd()
@@ -160,7 +162,7 @@ void cPluginMarkAd::MainThreadHook(void)
 cString cPluginMarkAd::Active(void)
 {
     // Return a message string if shutdown should be postponed
-    if (statusMonitor->MarkAdRunning())
+    if (statusMonitor->MarkAdRunning() && (setup.DeferredShutdown))
         return tr("markad still running");
     return NULL;
 }
-- 
cgit v1.2.3