diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | conflictcheck.h | 8 |
2 files changed, 9 insertions, 1 deletions
@@ -64,7 +64,7 @@ CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses -Wno-format-y2k ### The directory environment: -DVBDIR = ../../../../DVB +#DVBDIR = ../../../../DVB VDRDIR = ../../.. LIBDIR = ../../lib TMPDIR = /tmp 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; |