From 1743c82f5867943ab480b1243b137272f592204b Mon Sep 17 00:00:00 2001
From: Martin Gansser <mgansser@online.de>
Date: Dec 03 2019 08:38:06 +0000
Subject: Add patch menu_conflictcheck.patch to show device again in conflictcheck


---

diff --git a/menu_conflictcheck.patch b/menu_conflictcheck.patch
new file mode 100644
index 0000000..0ff8e46
--- /dev/null
+++ b/menu_conflictcheck.patch
@@ -0,0 +1,32 @@
+From 602d66c55964998ce25c6c57b302949a9517f149 Mon Sep 17 00:00:00 2001
+From: Johann Friedrichs <johann.friedrichs@web.de>
+Date: Mon, 2 Dec 2019 14:08:19 +0100
+Subject: Show device again in conflictcheck (revises 770de32f)
+
+
+diff --git a/menu_conflictcheck.c b/menu_conflictcheck.c
+index 01340f8..49f6926 100644
+--- a/menu_conflictcheck.c
++++ b/menu_conflictcheck.c
+@@ -159,15 +159,16 @@ cMenuConflictCheckDetailsItem::cMenuConflictCheckDetailsItem(cConflictCheckTimer
+ 
+ bool cMenuConflictCheckDetailsItem::Update(bool Force)
+ {
++#define MAXJFS 4096
+     bool oldhasTimer = hasTimer;
+     LOCK_TIMERS_READ;
+     hasTimer = timerObj->OrigTimer(Timers) ? timerObj->OrigTimer(Timers)->HasFlags(tfActive) : false;
+     if (Force || hasTimer != oldhasTimer) {
+         const cTimer* timer = timerObj->timer;
+-        char device[3] = ""; // compiler warns if MAXDEVICES too big 
++        char device[11] = "";
+         if (hasTimer) {
+             if (!timerObj->conflCheckTime && timerObj->device > -1)
+-                sprintf(device, "%d", (timerObj->device + 1)&MAXDEVICES);
++                sprintf(device, "%d", (timerObj->device + 1));
+             else {
+                 if (timer->Local())
+                     strcpy(device, tr("C"));
+-- 
+cgit v0.10.2
+
diff --git a/vdr-epgsearch.spec b/vdr-epgsearch.spec
index 93c61df..fb0eb81 100644
--- a/vdr-epgsearch.spec
+++ b/vdr-epgsearch.spec
@@ -3,7 +3,7 @@
 
 Name:           vdr-%{pname}
 Version:        2.4.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Powerful schedules menu replacement plugin for VDR
 
 License:        GPLv2+
@@ -19,6 +19,8 @@ Patch0:         %{name}-2.4.0-fedora.patch
 # Patche from upstream
 Patch1:         replace_auto_ptr_with_unique_ptr.patch
 Patch2:         Fix_possible_format_overflow_and_avoid_compiler_warning.patch
+# https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/patch/?id=602d66c55964998ce25c6c57b302949a9517f149
+Patch3:         menu_conflictcheck.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  vdr-devel >= 1.7.36
@@ -35,6 +37,7 @@ reusable queries which can be used as dynamic "search timers" etc.
 sed -e 's|__VARDIR__|%{vdr_vardir}|g' %{PATCH0} | %{__patch} -p1 --fuzz=0
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 for f in scripts/epgsearchcmds-french.conf conf/epgsearchcats.conf-tvm2vdr* ; do
     iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
@@ -80,6 +83,9 @@ install -dm 755 $RPM_BUILD_ROOT%{vdr_vardir}/epgsearch
 %defattr(-,root,root,-)
 
 %changelog
+* Tue Dec 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-10
+- Add patch menu_conflictcheck.patch to show device again in conflictcheck
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild