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

Fixed tuning to a live channel after a recording has been stopped using the 'Back' key

Browse Source
This commit is contained in:
Klaus Schmidinger 2008-03-14 13:27:39 +01:00
parent 864acdeed4
commit e68d8ab41c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -5718,3 +5718,5 @@ Video Disk Recorder Revision History
- Fixed displaying the free disk space when entering the recordings menu where the - Fixed displaying the free disk space when entering the recordings menu where the
last replayed recording was in a subdirectory, and pressing Back (thanks to Rolf last replayed recording was in a subdirectory, and pressing Back (thanks to Rolf
Ahrenberg). Ahrenberg).
- Fixed tuning to a live channel after a recording has been stopped using the
'Back' key.

7
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.cadsoft.de/vdr * The project's page is at http://www.cadsoft.de/vdr
* *
* $Id: vdr.c 1.312 2008/02/23 15:36:01 kls Exp $ * $Id: vdr.c 1.313 2008/03/14 13:22:39 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@ -546,6 +546,7 @@ int main(int argc, char *argv[])
int MaxLatencyTime = 0; int MaxLatencyTime = 0;
bool InhibitEpgScan = false; bool InhibitEpgScan = false;
bool IsInfoMenu = false; bool IsInfoMenu = false;
bool CheckHasProgramme = false;
cSkin *CurrentSkin = NULL; cSkin *CurrentSkin = NULL;
// Load plugins: // Load plugins:
@ -730,7 +731,7 @@ int main(int argc, char *argv[])
// Make sure we have a visible programme in case device usage has changed: // Make sure we have a visible programme in case device usage has changed:
if (!EITScanner.Active() && cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) { if (!EITScanner.Active() && cDevice::PrimaryDevice()->HasDecoder() && !cDevice::PrimaryDevice()->HasProgramme()) {
static time_t lastTime = 0; static time_t lastTime = 0;
if (!Menu && Now - lastTime > MINCHANNELWAIT) { // !Menu to avoid interfering with the CAM if a CAM menu is open if ((!Menu || CheckHasProgramme) && Now - lastTime > MINCHANNELWAIT) { // !Menu to avoid interfering with the CAM if a CAM menu is open
cChannel *Channel = Channels.GetByNumber(cDevice::CurrentChannel()); cChannel *Channel = Channels.GetByNumber(cDevice::CurrentChannel());
if (Channel && (Channel->Vpid() || Channel->Apid(0))) { if (Channel && (Channel->Vpid() || Channel->Apid(0))) {
if (!Channels.SwitchTo(cDevice::CurrentChannel()) // try to switch to the original channel... if (!Channels.SwitchTo(cDevice::CurrentChannel()) // try to switch to the original channel...
@ -739,6 +740,7 @@ int main(int argc, char *argv[])
} }
lastTime = Now; // don't do this too often lastTime = Now; // don't do this too often
LastTimerChannel = -1; LastTimerChannel = -1;
CheckHasProgramme = false;
} }
} }
// Restart the Watchdog timer: // Restart the Watchdog timer:
@ -1120,6 +1122,7 @@ int main(int argc, char *argv[])
DELETE_MENU; DELETE_MENU;
cControl::Shutdown(); cControl::Shutdown();
Menu = new cMenuMain(osRecordings); Menu = new cMenuMain(osRecordings);
CheckHasProgramme = true; // to have live tv after stopping replay with 'Back'
break; break;
case osReplay: DELETE_MENU; case osReplay: DELETE_MENU;
cControl::Shutdown(); cControl::Shutdown();