summaryrefslogtreecommitdiff
path: root/conflictcheck.h
diff options
context:
space:
mode:
authorChristian Wieninger <cwieninger@gmx.de>2012-03-04 09:44:19 +0100
committerChristian Wieninger <cwieninger@gmx.de>2012-03-04 09:44:19 +0100
commit15d08ffb09de612ae1eb53b2aeca2f906f7076a6 (patch)
treedc29b55b0d8d6a8263f166c02b52f2536304723c /conflictcheck.h
parent1c2297c7550cfe34902efa3c4d9fe1cc196658d2 (diff)
downloadvdr-plugin-epgsearch-15d08ffb09de612ae1eb53b2aeca2f906f7076a6.tar.gz
vdr-plugin-epgsearch-15d08ffb09de612ae1eb53b2aeca2f906f7076a6.tar.bz2
support for vdr 1.7.25
Diffstat (limited to 'conflictcheck.h')
-rw-r--r--conflictcheck.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/conflictcheck.h b/conflictcheck.h
index fcc6dcb..7e6fb7a 100644
--- a/conflictcheck.h
+++ b/conflictcheck.h
@@ -163,12 +163,20 @@ class cConflictCheckDevice
result = true;
#ifdef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE
else
+#if APIVERSNUM < 10725
result = Priority >= Setup.PrimaryLimit;
+#else
+ result = Priority >= 0;
+#endif
#endif
#endif
}
else
+#if APIVERSNUM < 10725
result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit;
+#else
+ result = !IsPrimaryDevice() || Priority >= 0;
+#endif
}
else
needsDetachReceivers = true;