changeset 222:db051dbf8d6e

Bitwise vs logical and fix
author Daniele Nicolodi <daniele.nicolodi@obspm.fr>
date Thu, 18 Sep 2014 18:02:20 +0200
parents c14f5a95850d
children 7875436125dd
files FXAnalyse.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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;