diff --git a/patches/vdr-2.4.0_zapcockpit.patch b/patches/vdr-2.4.0_zapcockpit.patch
index 3a2f43f..d29294e 100644
--- a/patches/vdr-2.4.0_zapcockpit.patch
+++ b/patches/vdr-2.4.0_zapcockpit.patch
@@ -1,6 +1,6 @@
-diff -Nur vdr-2.4.0/config.c vdr-2.4.0.p/config.c
---- vdr-2.4.0/config.c	2018-02-15 15:40:36.000000000 +0100
-+++ vdr-2.4.0.p/config.c	2019-04-04 14:57:48.234702963 +0200
+diff -Nur vdr-2.4.1/config.c vdr-2.4.1.p/config.c
+--- vdr-2.4.1/config.c	2018-02-15 15:40:36.000000000 +0100
++++ vdr-2.4.1.p/config.c	2020-02-07 10:19:48.221678977 +0100
 @@ -417,6 +417,11 @@
    strcpy(SVDRPDefaultHost, "");
    ZapTimeout = 3;
@@ -37,9 +37,9 @@ diff -Nur vdr-2.4.0/config.c vdr-2.4.0.p/config.c
    Store("RcRepeatDelay",      RcRepeatDelay);
    Store("RcRepeatDelta",      RcRepeatDelta);
    Store("DefaultPriority",    DefaultPriority);
-diff -Nur vdr-2.4.0/config.h vdr-2.4.0.p/config.h
---- vdr-2.4.0/config.h	2018-03-19 16:06:46.000000000 +0100
-+++ vdr-2.4.0.p/config.h	2019-04-04 14:57:48.235702949 +0200
+diff -Nur vdr-2.4.1/config.h vdr-2.4.1.p/config.h
+--- vdr-2.4.1/config.h	2019-06-16 11:13:45.000000000 +0200
++++ vdr-2.4.1.p/config.h	2020-02-07 10:19:48.221678977 +0100
 @@ -293,6 +293,11 @@
    char SVDRPDefaultHost[HOST_NAME_MAX];
    int ZapTimeout;
@@ -52,9 +52,9 @@ diff -Nur vdr-2.4.0/config.h vdr-2.4.0.p/config.h
    int RcRepeatDelay;
    int RcRepeatDelta;
    int DefaultPriority, DefaultLifetime;
-diff -Nur vdr-2.4.0/menu.c vdr-2.4.0.p/menu.c
---- vdr-2.4.0/menu.c	2019-04-04 15:47:25.722519143 +0200
-+++ vdr-2.4.0.p/menu.c	2019-04-04 15:29:02.650105356 +0200
+diff -Nur vdr-2.4.1/menu.c vdr-2.4.1.p/menu.c
+--- vdr-2.4.1/menu.c	2019-05-28 17:55:44.000000000 +0200
++++ vdr-2.4.1.p/menu.c	2020-02-07 11:13:24.404660741 +0100
 @@ -4184,6 +4184,11 @@
       }
    Add(new cMenuEditIntItem( tr("Setup.Miscellaneous$Zap timeout (s)"),            &data.ZapTimeout));
@@ -86,7 +86,7 @@ diff -Nur vdr-2.4.0/menu.c vdr-2.4.0.p/menu.c
  }
  
  cDisplayChannel::~cDisplayChannel()
-@@ -4922,6 +4928,793 @@
+@@ -4922,6 +4928,799 @@
    return osEnd;
  }
  
@@ -228,8 +228,11 @@ diff -Nur vdr-2.4.0/menu.c vdr-2.4.0.p/menu.c
 +         if (!Setup.ZapcockpitUseGroups)
 +            return false;
 +         cOsdProvider::OsdSizeChanged(osdState); // just to get the current state
++         {
++         LOCK_CHANNELS_READ;
 +         DisplayChannel();
 +         DisplayInfo();
++         }
 +         if (keyRightOpensChannellist) {
 +            InitGroupList(dcExt);
 +            state = esGroupsList;
@@ -245,8 +248,11 @@ diff -Nur vdr-2.4.0/menu.c vdr-2.4.0.p/menu.c
 +         if (!Setup.ZapcockpitUseGroups)
 +            return false;
 +         cOsdProvider::OsdSizeChanged(osdState); // just to get the current state
++         {
++         LOCK_CHANNELS_READ;
 +         DisplayChannel();
 +         DisplayInfo();
++         }
 +         if (keyRightOpensChannellist) {
 +            InitChannelList(dcExt);
 +            state = esChannelList;
@@ -880,9 +886,9 @@ diff -Nur vdr-2.4.0/menu.c vdr-2.4.0.p/menu.c
  // --- cDisplayVolume --------------------------------------------------------
  
  #define VOLUMETIMEOUT 1000 //ms
-diff -Nur vdr-2.4.0/menu.h vdr-2.4.0.p/menu.h
---- vdr-2.4.0/menu.h	2018-04-14 12:24:41.000000000 +0200
-+++ vdr-2.4.0.p/menu.h	2019-04-04 15:27:27.648451092 +0200
+diff -Nur vdr-2.4.1/menu.h vdr-2.4.1.p/menu.h
+--- vdr-2.4.1/menu.h	2018-04-14 12:24:41.000000000 +0200
++++ vdr-2.4.1.p/menu.h	2020-02-07 10:19:48.222678975 +0100
 @@ -119,30 +119,102 @@
  
  class cDisplayChannel : public cOsdObject {
@@ -994,9 +1000,9 @@ diff -Nur vdr-2.4.0/menu.h vdr-2.4.0.p/menu.h
  class cDisplayVolume : public cOsdObject {
  private:
    cSkinDisplayVolume *displayVolume;
-diff -Nur vdr-2.4.0/po/de_DE.po vdr-2.4.0.p/po/de_DE.po
---- vdr-2.4.0/po/de_DE.po	2019-04-04 15:47:31.199441881 +0200
-+++ vdr-2.4.0.p/po/de_DE.po	2019-04-04 15:29:21.903832616 +0200
+diff -Nur vdr-2.4.1/po/de_DE.po vdr-2.4.1.p/po/de_DE.po
+--- vdr-2.4.1/po/de_DE.po	2018-04-10 15:22:27.000000000 +0200
++++ vdr-2.4.1.p/po/de_DE.po	2020-02-07 10:19:48.223678974 +0100
 @@ -1347,6 +1347,21 @@
  msgid "Setup.Miscellaneous$Channel entry timeout (ms)"
  msgstr "Zeitlimit für Kanaleingabe (ms)"
@@ -1029,9 +1035,9 @@ diff -Nur vdr-2.4.0/po/de_DE.po vdr-2.4.0.p/po/de_DE.po
  msgid "No audio available!"
  msgstr "Kein Audio verfügbar!"
  
-diff -Nur vdr-2.4.0/skins.c vdr-2.4.0.p/skins.c
---- vdr-2.4.0/skins.c	2019-04-04 15:47:25.665519948 +0200
-+++ vdr-2.4.0.p/skins.c	2019-04-04 14:57:48.240702878 +0200
+diff -Nur vdr-2.4.1/skins.c vdr-2.4.1.p/skins.c
+--- vdr-2.4.1/skins.c	2019-05-29 18:49:48.000000000 +0200
++++ vdr-2.4.1.p/skins.c	2020-02-07 10:19:48.223678974 +0100
 @@ -79,6 +79,13 @@
       SetMessage(mtInfo, cString::sprintf(tr("Moving dish to %.1f..."), double(positioner->TargetLongitude()) / 10));
  }
@@ -1046,9 +1052,9 @@ diff -Nur vdr-2.4.0/skins.c vdr-2.4.0.p/skins.c
  // --- cSkinDisplayMenu ------------------------------------------------------
  
  cSkinDisplayMenu::cSkinDisplayMenu(void)
-diff -Nur vdr-2.4.0/skins.h vdr-2.4.0.p/skins.h
---- vdr-2.4.0/skins.h	2017-11-02 16:04:56.000000000 +0100
-+++ vdr-2.4.0.p/skins.h	2019-04-04 14:57:48.241702864 +0200
+diff -Nur vdr-2.4.1/skins.h vdr-2.4.1.p/skins.h
+--- vdr-2.4.1/skins.h	2019-05-29 18:49:48.000000000 +0200
++++ vdr-2.4.1.p/skins.h	2020-02-07 10:19:48.223678974 +0100
 @@ -101,6 +101,34 @@
    */
    };
@@ -1084,9 +1090,9 @@ diff -Nur vdr-2.4.0/skins.h vdr-2.4.0.p/skins.h
  enum eMenuCategory {
    mcUndefined = -1,
    mcUnknown = 0,
-diff -Nur vdr-2.4.0/vdr.c vdr-2.4.0.p/vdr.c
---- vdr-2.4.0/vdr.c	2019-04-04 15:47:25.719519186 +0200
-+++ vdr-2.4.0.p/vdr.c	2019-04-04 14:57:48.241702864 +0200
+diff -Nur vdr-2.4.1/vdr.c vdr-2.4.1.p/vdr.c
+--- vdr-2.4.1/vdr.c	2019-05-23 12:02:45.000000000 +0200
++++ vdr-2.4.1.p/vdr.c	2020-02-07 10:19:48.223678974 +0100
 @@ -1088,7 +1088,7 @@
          // Channel display:
          if (!EITScanner.Active() && cDevice::CurrentChannel() != LastChannel) {
@@ -1096,7 +1102,7 @@ diff -Nur vdr-2.4.0/vdr.c vdr-2.4.0.p/vdr.c
             LastChannel = cDevice::CurrentChannel();
             LastChannelChanged = Now;
             }
-@@ -1287,7 +1287,8 @@
+@@ -1289,7 +1289,8 @@
            case kChanDn|k_Repeat:
            case kChanDn:
                 if (!Interact) {
@@ -1106,7 +1112,7 @@ diff -Nur vdr-2.4.0/vdr.c vdr-2.4.0.p/vdr.c
                    continue;
                    }
                 else if (cDisplayChannel::IsOpen() || cControl::Control()) {
-@@ -1480,7 +1481,8 @@
+@@ -1482,7 +1483,8 @@
               case kUp:
               case kDown|k_Repeat:
               case kDown: