Fixed a compiler error for VDR < 2.3.0 and Cosmetic changes

2 files changed, 6 insertions, 12 deletions

diff --git a/recmanager.c b/recmanager.c
index 24f897d..eb9a43a 100644
--- a/recmanager.c
+++ b/recmanager.c
@@ -231,7 +231,8 @@ void cRecManager::DeleteTimer(const cTimer *timer) {
     cTimers* timers = &Timers;
     cTimer* t = timers->GetTimer((cTimer*)timer);
 #endif
-
+    if (!t)
+        return;
     if (t->Recording()) {
         t->Skip();
 #if VDRVERSNUM >= 20301
@@ -341,8 +342,7 @@ cTVGuideTimerConflicts *cRecManager::CheckTimerConflict(void) {
 }
 
 void cRecManager::CreateSeriesTimer(cTimer *seriesTimer) {
-#if VDRVERSNUM >= 20301
-#else
+#if VDRVERSNUM < 20300
     seriesTimer->SetEventFromSchedule();
 #endif
     if (tvguideConfig.useRemoteTimers && pRemoteTimers) {
@@ -355,12 +355,11 @@ void cRecManager::CreateSeriesTimer(cTimer *seriesTimer) {
 #if VDRVERSNUM >= 20301
         LOCK_TIMERS_WRITE;
         cTimers* timers = Timers;
-        timers->Add(seriesTimer);
-        timers->SetModified();
 #else
-        Timers.Add(seriesTimer);
-        Timers.SetModified();
+        cTimers* timers = &Timers;
 #endif
+        timers->Add(seriesTimer);
+        timers->SetModified();
     }
 }
 
diff --git a/searchtimer.h b/searchtimer.h
index b47dc97..65a04c9 100644
--- a/searchtimer.h
+++ b/searchtimer.h
@@ -12,13 +12,8 @@ protected:
     int         startTime;

     int      	stopTime;

     int         useChannel;

-#if VDRVERSNUM >= 20301

     const cChannel    *channelMin;

     const cChannel    *channelMax;

-#else

-    cChannel 	*channelMin;

-    cChannel 	*channelMax;

-#endif

     std::string channelGroup;

     int      	useCase;

     int      	mode;