From 7e6c2d47e04682b3664daabe17c1cabab8490181 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 27 Oct 2001 12:04:36 +0200 Subject: [PATCH] Fixed a crash when pressing the '2' button while replaying a DVD --- HISTORY | 1 + menu.c | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/HISTORY b/HISTORY index aef14350..1c82f0f8 100644 --- a/HISTORY +++ b/HISTORY @@ -839,3 +839,4 @@ Video Disk Recorder Revision History and Setup.ShowReplayMode is enabled. - New SVDRP commands LSTR and DELR to list and delete recordings (thanks to Thomas Heiligenmann). +- Fixed a crash when pressing the '2' button while replaying a DVD. diff --git a/menu.c b/menu.c index 138a5c74..a1c7f231 100644 --- a/menu.c +++ b/menu.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: menu.c 1.132 2001/10/27 10:20:04 kls Exp $ + * $Id: menu.c 1.133 2001/10/27 12:03:19 kls Exp $ */ #include "menu.h" @@ -2666,15 +2666,17 @@ void cReplayControl::MarkMove(bool Forward) void cReplayControl::EditCut(void) { - Hide(); - if (!cVideoCutter::Active()) { - if (!cVideoCutter::Start(fileName)) - Interface->Error(tr("Can't start editing process!")); + if (fileName) { + Hide(); + if (!cVideoCutter::Active()) { + if (!cVideoCutter::Start(fileName)) + Interface->Error(tr("Can't start editing process!")); + else + Interface->Info(tr("Editing process started")); + } else - Interface->Info(tr("Editing process started")); + Interface->Error(tr("Editing process already active!")); } - else - Interface->Error(tr("Editing process already active!")); } void cReplayControl::EditTest(void)