From 8a2bbd34b5b4851886e66543f289e2aeb2b86e55 Mon Sep 17 00:00:00 2001 From: gixxpunk Date: Sun, 17 Apr 2011 15:29:53 +0000 Subject: [PATCH] try to fix wrong wakup channel after standby recordings. This is a very hacky, but should work. Please don't hesitate to revert my changes if you have a proper solution for this problem. git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1407 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/102e156fc3d959255a372e3987897228387901ae Author: gixxpunk Date: 2011-04-17 (Sun, 17 Apr 2011) Origin message was: ------------------ - try to fix wrong wakup channel after standby recordings. This is a very hacky, but should work. Please don't hesitate to revert my changes if you have a proper solution for this problem. git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1407 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/neutrino.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index eb41a77ec..27b6d82bf 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -167,6 +167,7 @@ uint32_t shift_timer; uint32_t scrambled_timer; char recDir[255]; char timeshiftDir[255]; +t_channel_id standby_channel_id; //char current_volume; extern int list_changed; @@ -3952,7 +3953,9 @@ void CNeutrinoApp::standbyMode( bool bOnOff ) } if(g_settings.mode_clock) InfoClock->StopClock(); - + + //remember tuned channel-id + standby_channel_id = live_channel_id; puts("[neutrino.cpp] executing " NEUTRINO_ENTER_STANDBY_SCRIPT "."); if (system(NEUTRINO_ENTER_STANDBY_SCRIPT) != 0) @@ -4020,6 +4023,9 @@ void CNeutrinoApp::standbyMode( bool bOnOff ) } else { tvMode( false ); } + if(!recordingstatus) { //only switch to standby_channel_id when not recording + live_channel_id = standby_channel_id; + } channelList->setSelected(0xfffffff); /* make sure that zapTo_ChannelID will zap */ channelList->zapTo_ChannelID(live_channel_id); if(recordingstatus) was_record = 0;