summaryrefslogtreecommitdiff
path: root/menu.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2017-11-26 15:07:00 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2017-11-26 15:07:00 +0100
commit9d5ce204aafdfdc609138ef9612dc44a81c0794d (patch)
tree608b2ee356bdebeacdea59bd4296f7904d12d7b1 /menu.c
parenta9d82331e63353e92a3673670de9007a9c93dc39 (diff)
downloadvdr-9d5ce204aafdfdc609138ef9612dc44a81c0794d.tar.gz
vdr-9d5ce204aafdfdc609138ef9612dc44a81c0794d.tar.bz2
Now calling Hide() and cStatus::MsgReplaying(..., false) from cReplayControl::Stop()
Diffstat (limited to 'menu.c')
-rw-r--r--menu.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/menu.c b/menu.c
index f69f25ec..f5545edc 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 4.44 2017/11/09 14:56:38 kls Exp $
+ * $Id: menu.c 4.45 2017/11/26 15:07:00 kls Exp $
*/
#include "menu.h"
@@ -5476,8 +5476,6 @@ cReplayControl::cReplayControl(bool PauseLive)
cReplayControl::~cReplayControl()
{
cDevice::PrimaryDevice()->SetKeepTracks(false);
- Hide();
- cStatus::MsgReplaying(this, NULL, fileName, false);
Stop();
if (currentReplayControl == this)
currentReplayControl = NULL;
@@ -5485,6 +5483,8 @@ cReplayControl::~cReplayControl()
void cReplayControl::Stop(void)
{
+ Hide();
+ cStatus::MsgReplaying(this, NULL, fileName, false);
if (Setup.DelTimeshiftRec && *fileName) {
cRecordControl* rc = cRecordControls::GetRecordControl(fileName);
if (rc && rc->InstantId()) {
@@ -5940,8 +5940,7 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
SkipSeconds(Setup.SkipSecondsRepeat); break;
case kYellow: SkipSeconds(Setup.SkipSeconds); break;
case kStop:
- case kBlue: Hide();
- Stop();
+ case kBlue: Stop();
return osEnd;
default: {
DoShowMode = false;
@@ -5985,8 +5984,7 @@ eOSState cReplayControl::ProcessKey(eKeys Key)
else
Show();
break;
- case kBack: Hide();
- Stop();
+ case kBack: Stop();
return osRecordings;
default: return osUnknown;
}