From 1d4a7e06b4e5cc5a1f115d9d361c2c7b60699ff9 Mon Sep 17 00:00:00 2001 From: Frank Schmirler Date: Fri, 1 Nov 2013 15:33:19 +0100 Subject: Set device occupied when streamdev switches away LiveTV on the server, to reduce the risk that the VDR main loop immediately switches back, resulting in a black screen on the client (reported by hummel99) --- server/connectionVTP.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'server/connectionVTP.c') diff --git a/server/connectionVTP.c b/server/connectionVTP.c index b3be57e..087d02d 100644 --- a/server/connectionVTP.c +++ b/server/connectionVTP.c @@ -1118,11 +1118,8 @@ bool cConnectionVTP::CmdTUNE(char *Opts) if (!ProvidesChannel(chan, prio)) return Respond(560, "Channel not available (ProvidesChannel)"); } - if ((dev = GetDevice(chan, prio)) == NULL) - return Respond(560, "Channel not available (GetDevice)"); - - if (!dev->SwitchChannel(chan, false)) - return Respond(560, "Channel not available (SwitchChannel)"); + if ((dev = SwitchDevice(chan, prio)) == NULL) + return Respond(560, "Channel not available (SwitchDevice)"); delete m_LiveStreamer; m_LiveStreamer = new cStreamdevLiveStreamer(prio, this); -- cgit v1.2.3