summaryrefslogtreecommitdiff
path: root/menu.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2018-05-27 09:55:30 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2018-05-27 09:55:30 +0200
commit30eb01ef3792e3fb75eabc34e8258d66197ec75d (patch)
tree7f282c84ba23154caae8fb30ac6674d84743866f /menu.c
parentd380b57d2849d0df66c14995130dcbbfadbc9d1f (diff)
downloadvdr-30eb01ef3792e3fb75eabc34e8258d66197ec75d.tar.gz
vdr-30eb01ef3792e3fb75eabc34e8258d66197ec75d.tar.bz2
Fixed locking the Channels list in cDisplayChannel, where the lock was still held when Flush() was called (cont'd)
Diffstat (limited to 'menu.c')
-rw-r--r--menu.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/menu.c b/menu.c
index a9ea49d2..b44f36cc 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.76 2018/05/06 09:30:11 kls Exp $
+ * $Id: menu.c 4.77 2018/05/27 09:51:56 kls Exp $
*/
#include "menu.h"
@@ -4654,8 +4654,10 @@ cDisplayChannel::cDisplayChannel(eKeys FirstKey)
displayChannel = Skins.Current()->DisplayChannel(withInfo);
positioner = NULL;
channel = NULL;
- LOCK_CHANNELS_READ;
- channel = Channels->GetByNumber(cDevice::CurrentChannel());
+ {
+ LOCK_CHANNELS_READ;
+ channel = Channels->GetByNumber(cDevice::CurrentChannel());
+ }
ProcessKey(FirstKey);
}