# HG changeset patch
# User Daniele Nicolodi <daniele.nicolodi@obspm.fr>
# Date 1411056140 -7200
# Node ID db051dbf8d6e3014e1c2087dd5b90ea0fec526ce
# Parent  c14f5a95850d3c1df3715ec856e9817416ba4f8a
Bitwise vs logical and fix

diff -r c14f5a95850d -r db051dbf8d6e FXAnalyse.c
--- a/FXAnalyse.c	Thu Sep 18 18:01:56 2014 +0200
+++ b/FXAnalyse.c	Thu Sep 18 18:02:20 2014 +0200
@@ -1300,10 +1300,10 @@
 				}
 				
 				// stop dedrift if the comb is not locked
-				if ((dedrift.enabled)
-					& (dedrift.threshold != 0.0)
-					& (freq.previous != 0.0)
-					& (fabs(f - freq.previous) > dedrift.threshold)) {
+				if ((dedrift.enabled) &&
+				    (dedrift.threshold != 0.0) &&
+				    (freq.previous != 0.0) &&
+				    (fabs(f - freq.previous) > dedrift.threshold)) {
 						
 					if (! dedrift.keep_slope) {
 						dedrift.applied = 0.0;