From 88a2ef45eed69224a378f09ef4511cbe8956248a Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Mon, 13 Jul 2020 08:16:41 +0200 Subject: Fixed a possible 'invalid lock sequence' when switching to an unavailable channel with the main menu open --- HISTORY | 4 +++- device.c | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/HISTORY b/HISTORY index b7a517b9..074f67e9 100644 --- a/HISTORY +++ b/HISTORY @@ -9499,7 +9499,7 @@ Video Disk Recorder Revision History rendered the whole code branch inactive. Now this branch is only executed for devices that are not bonded. -2020-07-10: +2020-07-13: - Improved deleting plugins in case the plugin uses its own memory management (thanks to Winfried Köhler). Plugins that have been compiled with previous versions of VDR @@ -9509,3 +9509,5 @@ Video Disk Recorder Revision History (reported by Thomas Reufer). - Fixed handling inactive shared CA pids (thanks to Helmut Binder). - Implemented handling multi packet CATs with MTD (thanks to Helmut Binder). +- Fixed a possible 'invalid lock sequence' when switching to an unavailable channel + with the main menu open. diff --git a/device.c b/device.c index eba59c30..e77bec2e 100644 --- a/device.c +++ b/device.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: device.c 4.34 2020/06/27 10:24:46 kls Exp $ + * $Id: device.c 4.35 2020/07/13 08:16:41 kls Exp $ */ #include "device.h" @@ -808,9 +808,9 @@ bool cDevice::SwitchChannel(const cChannel *Channel, bool LiveView) for (int i = 3; i--;) { switch (SetChannel(Channel, LiveView)) { case scrOk: return true; - case scrNotAvailable: Skins.Message(mtInfo, tr("Channel not available!")); + case scrNotAvailable: Skins.QueueMessage(mtInfo, tr("Channel not available!")); return false; - case scrNoTransfer: Skins.Message(mtError, tr("Can't start Transfer Mode!")); + case scrNoTransfer: Skins.QueueMessage(mtError, tr("Can't start Transfer Mode!")); return false; case scrFailed: break; // loop will retry default: esyslog("ERROR: invalid return value from SetChannel"); -- cgit v1.2.3