From 22b4b620972d29510263805563aa53e810a11165 Mon Sep 17 00:00:00 2001
From: Christian Wieninger <cwieninger (at) gmx (dot) de>
Date: Sat, 22 Mar 2008 09:01:48 +0100
Subject: support for a conf.d subdirectory

---
 conflictcheck.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'conflictcheck.c')

diff --git a/conflictcheck.c b/conflictcheck.c
index 6c0ea4b..2016842 100644
--- a/conflictcheck.c
+++ b/conflictcheck.c
@@ -183,7 +183,7 @@ void cConflictCheck::InitDevicesInfo()
 {
     devices = new cConflictCheckDevice[MAXDEVICES];
 #ifdef DEBUG_CONFL
-    numDevices = 2;
+    numDevices = 1;
     for(int i=0; i<numDevices; i++)
     {
 	devices[i].devicenr = i;
@@ -579,10 +579,10 @@ int cConflictCheck::GetDevice(cConflictCheckTimerObj* TimerObj, bool *NeedsDetac
          imp <<= 1; imp |= !devices[i].Receiving() || ndr;
          imp <<= 1; imp |= devices[i].Receiving();
          imp <<= 1; //imp |= devices[i] == ActualDevice(); // cannot be handled
-         imp <<= 1; imp |= devices[i].IsPrimaryDevice();
-         imp <<= 1; imp |= devices[i].HasDecoder();
          imp <<= 8; imp |= min(max(devices[i].Priority() + MAXPRIORITY, 0), 0xFF);
          imp <<= 8; imp |= min(max(devices[i].ProvidesCa(Channel), 0), 0xFF);
+         imp <<= 1; imp |= devices[i].IsPrimaryDevice();
+         imp <<= 1; imp |= devices[i].HasDecoder();
          if (imp < Impact) {
             Impact = imp;
 	    selDevice = i;
-- 
cgit v1.2.3