From 2d64e54f0194b703029ab81353416393480002c0 Mon Sep 17 00:00:00 2001
From: Andreas Mair <amair.sob@googlemail.com>
Date: Fri, 19 Apr 2013 12:09:44 +0200
Subject: Reworked cPluginExtrecmenu::Service() again because "Id" has to be
 checked even if "Data" is NULL.

---
 extrecmenu.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/extrecmenu.c b/extrecmenu.c
index a408e82..471a0fc 100644
--- a/extrecmenu.c
+++ b/extrecmenu.c
@@ -254,12 +254,15 @@ bool cPluginExtrecmenu::SetupParse(const char *_Name,const char *Value)
 
 bool cPluginExtrecmenu::Service(const char *Id,void *Data)
 {
-  if(!Data)
+  if(!Id)
     return false;
 
-  cOsdMenu **menu=(cOsdMenu**)Data;
   if(mysetup.ReplaceOrgRecMenu && strcmp(Id,"MainMenuHooksPatch-v1.0::osRecordings")==0)
   {
+    if(!Data)
+      return true;
+
+    cOsdMenu **menu=(cOsdMenu**)Data;
     if(menu)
       *menu=(cOsdMenu*)MainMenuAction();
 
-- 
cgit v1.2.3