diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2017-05-20 13:01:34 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2017-05-20 13:01:34 +0200 |
| commit | 0b9870959beb7ae6a063f73fd5fada8f1faefadb (patch) | |
| tree | cc74b43431d8694df490b525e9dc79ddaff7fcb2 /menu.c | |
| parent | 4100b47b370d10caa28d9823cd70f77a34004459 (diff) | |
| download | vdr-0b9870959beb7ae6a063f73fd5fada8f1faefadb.tar.gz vdr-0b9870959beb7ae6a063f73fd5fada8f1faefadb.tar.bz2 | |
Fixed handling remote timers
Diffstat (limited to 'menu.c')
| -rw-r--r-- | menu.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: menu.c 4.27 2017/05/17 09:15:51 kls Exp $ + * $Id: menu.c 4.28 2017/05/20 13:00:21 kls Exp $ */ #include "menu.h" @@ -1328,7 +1328,7 @@ eOSState cMenuTimers::New(void) if (HasSubMenu()) return osContinue; cTimer *Timer = new cTimer; - if (*Setup.SVDRPDefaultHost) + if (Setup.SVDRPPeering && *Setup.SVDRPDefaultHost) Timer->SetRemote(Setup.SVDRPDefaultHost); return AddSubMenu(new cMenuEditTimer(Timer, true)); } @@ -1660,7 +1660,7 @@ eOSState cMenuWhatsOn::Record(void) return AddSubMenu(new cMenuEditTimer(Timer)); } cTimer *Timer = new cTimer(item->event); - if (*Setup.SVDRPDefaultHost) + if (Setup.SVDRPPeering && *Setup.SVDRPDefaultHost) Timer->SetRemote(Setup.SVDRPDefaultHost); if (cTimer *t = Timers->GetTimer(Timer)) { delete Timer; @@ -1674,7 +1674,6 @@ eOSState cMenuWhatsOn::Record(void) if (!HandleRemoteModifications(Timer)) { // must add the timer before HandleRemoteModifications to get proper log messages with timer ids Timers->Del(Timer); - delete Timer; } } if (HasSubMenu()) @@ -1944,7 +1943,7 @@ eOSState cMenuSchedule::Record(void) return AddSubMenu(new cMenuEditTimer(Timer)); } cTimer *Timer = new cTimer(item->event); - if (*Setup.SVDRPDefaultHost) + if (Setup.SVDRPPeering && *Setup.SVDRPDefaultHost) Timer->SetRemote(Setup.SVDRPDefaultHost); if (cTimer *t = Timers->GetTimer(Timer)) { delete Timer; @@ -1958,7 +1957,6 @@ eOSState cMenuSchedule::Record(void) if (!HandleRemoteModifications(Timer)) { // must add the timer before HandleRemoteModifications to get proper log messages with timer ids Timers->Del(Timer); - delete Timer; } } if (HasSubMenu()) |