summaryrefslogtreecommitdiff
path: root/menu.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2017-11-09 16:23:15 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2017-11-09 16:23:15 +0100
commit950b248220c64aea4078ce0461647d020db4c44f (patch)
tree9f742e801a412862c2dd622741a8f881fa43f8f0 /menu.c
parentbc3b6ed601f37fa6b2cfb7dec9e39439590be6b3 (diff)
downloadvdr-950b248220c64aea4078ce0461647d020db4c44f.tar.gz
vdr-950b248220c64aea4078ce0461647d020db4c44f.tar.bz2
Switching the primary device is no longer done via osSwitchDvb, but rather by the main program loop reacting to changes in Setup.PrimaryDVB
Diffstat (limited to 'menu.c')
-rw-r--r--menu.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/menu.c b/menu.c
index a12276df..f69f25ec 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.43 2017/11/02 15:26:42 kls Exp $
+ * $Id: menu.c 4.44 2017/11/09 14:56:38 kls Exp $
*/
#include "menu.h"
@@ -3587,7 +3587,6 @@ void cMenuSetupDVB::Setup(void)
eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
{
- int oldPrimaryDVB = ::Setup.PrimaryDVB;
int oldVideoDisplayFormat = ::Setup.VideoDisplayFormat;
bool oldVideoFormat = ::Setup.VideoFormat;
bool newVideoFormat = data.VideoFormat;
@@ -3650,8 +3649,6 @@ eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
}
}
if (state == osBack && Key == kOk) {
- if (::Setup.PrimaryDVB != oldPrimaryDVB)
- state = osSwitchDvb;
if (::Setup.VideoDisplayFormat != oldVideoDisplayFormat)
cDevice::PrimaryDevice()->SetVideoDisplayFormat(eVideoDisplayFormat(::Setup.VideoDisplayFormat));
if (::Setup.VideoFormat != oldVideoFormat)