1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

Fixed a superfluous call to the skin's SetRecording() function after renaming a recording

This commit is contained in:
Klaus Schmidinger 2014-01-25 12:44:32 +01:00
parent fdbf796b6b
commit 8b9e1f513f
3 changed files with 7 additions and 7 deletions

View File

@ -2394,6 +2394,8 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
for reporting that the source recording was not deleted after moving it to a different for reporting that the source recording was not deleted after moving it to a different
volume volume
for suggesting to replace "Schnitt" with "Bearbeitung" in the German OSD texts for suggesting to replace "Schnitt" with "Bearbeitung" in the German OSD texts
for reporting a superfluous call to the skin's SetRecording() function after renaming
a recording
Pekka Mauno <pekka.mauno@iki.fi> Pekka Mauno <pekka.mauno@iki.fi>
for fixing cSchedule::GetFollowingEvent() in case there is currently no present for fixing cSchedule::GetFollowingEvent() in case there is currently no present

View File

@ -8167,3 +8167,5 @@ Video Disk Recorder Revision History
This may, for instance, be useful for plugins that implement live streaming, so that This may, for instance, be useful for plugins that implement live streaming, so that
they can react on changes to a channel's PIDs or CA descriptors (problem reported they can react on changes to a channel's PIDs or CA descriptors (problem reported
by Mariusz Bialonczyk). by Mariusz Bialonczyk).
- Fixed a superfluous call to the skin's SetRecording() function after renaming a
recording (reported by Christoph Haubrich).

10
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 3.15 2013/12/27 09:00:24 kls Exp $ * $Id: menu.c 3.16 2014/01/25 12:40:28 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -2473,12 +2473,8 @@ void cMenuRecording::Display(void)
eOSState cMenuRecording::ProcessKey(eKeys Key) eOSState cMenuRecording::ProcessKey(eKeys Key)
{ {
if (HasSubMenu()) { if (HasSubMenu())
eOSState state = cOsdMenu::ProcessKey(Key); return cOsdMenu::ProcessKey(Key);
if (state == osUser1)
CloseSubMenu();
return state;
}
else if (!RefreshRecording()) else if (!RefreshRecording())
return osBack; // the recording has vanished, so close this menu return osBack; // the recording has vanished, so close this menu
switch (int(Key)) { switch (int(Key)) {