frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

It is now possible to directly delete a timer that is currently recording

Browse Source
This commit is contained in:
Klaus Schmidinger 2003-05-25 14:14:32 +02:00
parent ecd74adeca
commit ffc7a80577
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTORS
View File

@ -696,3 +696,6 @@ Hermann Gausterer <mrq1@gmx.net>
Peter Bieringer <pb@bieringer.de> Peter Bieringer <pb@bieringer.de>
for reporting a problem with duplicate recordings with the same file name for reporting a problem with duplicate recordings with the same file name
Alexander Damhuis <ad@phonedation.de>
for reporting problems when deleting a timer that is currently recording

2
HISTORY
View File

@ -2206,3 +2206,5 @@ Video Disk Recorder Revision History
second timer (thanks to Peter Bieringer for reporting this one). second timer (thanks to Peter Bieringer for reporting this one).
- Fixed handling newly created timers in case they are not confirmed with "Ok" - Fixed handling newly created timers in case they are not confirmed with "Ok"
(thanks to Gerhard Steiner for reporting this one). (thanks to Gerhard Steiner for reporting this one).
- It is now possible to directly delete a timer that is currently recording
(thanks to Alexander Damhuis for reporting this one).

14
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: menu.c 1.248 2003/05/25 13:53:53 kls Exp $ * $Id: menu.c 1.249 2003/05/25 14:06:17 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -1053,8 +1053,15 @@ eOSState cMenuTimers::Delete(void)
// Check if this timer is active: // Check if this timer is active:
cTimer *ti = CurrentTimer(); cTimer *ti = CurrentTimer();
if (ti) { if (ti) {
if (!ti->Recording()) {
if (Interface->Confirm(tr("Delete timer?"))) { if (Interface->Confirm(tr("Delete timer?"))) {
if (ti->Recording()) {
if (Interface->Confirm(tr("Timer still recording - really delete?"))) {
ti->Skip();
cRecordControls::Process(time(NULL));
}
else
return osContinue;
}
int Index = ti->Index(); int Index = ti->Index();
Timers.Del(ti); Timers.Del(ti);
cOsdMenu::Del(Current()); cOsdMenu::Del(Current());
@ -1063,9 +1070,6 @@ eOSState cMenuTimers::Delete(void)
isyslog("timer %d deleted", Index + 1); isyslog("timer %d deleted", Index + 1);
} }
} }
else
Interface->Error(tr("Timer is recording!"));
}
return osContinue; return osContinue;
} }