Display the root video folder again when opening ExtRecMenu (closes #1447)

4 files changed, 8 insertions, 2 deletions

diff --git a/mymenurecordings.c b/mymenurecordings.c
index 99e735f..e44ed06 100644
--- a/mymenurecordings.c
+++ b/mymenurecordings.c
@@ -542,7 +542,7 @@ myMenuRecordings::myMenuRecordings(const char *Base,int Level):cOsdMenu("")
 
   Recordings.StateChanged(recordingsstate);
 
-  Display();
+  //Display();
 
   if(wasdvd&&!cControl::Control())
   {
@@ -585,8 +585,9 @@ myMenuRecordings::myMenuRecordings(const char *Base,int Level):cOsdMenu("")
 
   Set();
 
-  if(mysetup.GoLastReplayed && myReplayControl::LastReplayed())
+  if(mysetup.GoLastReplayed && mysetup.ReturnToRec && myReplayControl::LastReplayed())
     Open();
+  mysetup.ReturnToRec = false;
 
   Display();
   SetHelpKeys();
diff --git a/mymenusetup.c b/mymenusetup.c
index 3092d2a..f8de69e 100644
--- a/mymenusetup.c
+++ b/mymenusetup.c
@@ -58,6 +58,7 @@ mySetup::mySetup()
   mysetup.DescendSorting=0;
   mysetup.GoLastReplayed=0;
   mysetup.ReturnToPlugin=1;
+  mysetup.ReturnToRec=0;
   mysetup.LimitBandwidth=0;
   mysetup.UseVDRsRecInfoMenu=0;
   mysetup.PatchFont=1;
diff --git a/mymenusetup.h b/mymenusetup.h
index 0b88bd0..fe1319c 100644
--- a/mymenusetup.h
+++ b/mymenusetup.h
@@ -67,6 +67,7 @@ class mySetup
   int DescendSorting;
   int GoLastReplayed;
   int ReturnToPlugin;
+  int ReturnToRec;
   int LimitBandwidth;
   int UseVDRsRecInfoMenu;
   int PatchFont;
diff --git a/myreplaycontrol.c b/myreplaycontrol.c
index f43e9b6..a7a76b4 100644
--- a/myreplaycontrol.c
+++ b/myreplaycontrol.c
@@ -22,7 +22,10 @@ myReplayControl::myReplayControl()
 myReplayControl::~myReplayControl()
 {
   if(fCallPlugin)
+  {
+    mysetup.ReturnToRec = true;
     cRemote::CallPlugin("extrecmenu");
+  }
 }
 
 eOSState myReplayControl::ProcessKey(eKeys Key)