never mark a timer as conlicting when it's recording

pipelka · Mar 2, 2014 · 77a27f8 · 77a27f8
1 parent 0450eb5
commit 77a27f8
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/xvdr/XBMCClient.cpp b/src/xvdr/XBMCClient.cpp
@@ -411,15 +411,15 @@ PVR_TIMER& operator<< (PVR_TIMER& lhs, const Timer& rhs) {
 
   lhs.state = PVR_TIMER_STATE_CANCELLED;
 
-  if(rhs.State & 2048) {
+  if(rhs.State & 8) {
+    lhs.state = PVR_TIMER_STATE_RECORDING;
+  }
+  else if(rhs.State & 2048) {
     lhs.state = PVR_TIMER_STATE_CONFLICT_NOK;
   }
   else if(rhs.State & 1024) {
     lhs.state = PVR_TIMER_STATE_CONFLICT_OK;
   }
-  else if(rhs.State & 8) {
-    lhs.state = PVR_TIMER_STATE_RECORDING;
-  }
   else if(rhs.State & 1) {
     lhs.state = PVR_TIMER_STATE_SCHEDULED;
   }