Merge release-4-6 into master

[alexxy/gromacs.git] / src / tools / gmx_trjconv.c

diff --git a/src/tools/gmx_trjconv.c b/src/tools/gmx_trjconv.c
index 51f6b12c569b311cb2a4ab7cacb80adac1ce7a33..7de477a1402bffd7839d05646894281d91a6c603 100644 (file)
--- a/src/tools/gmx_trjconv.c
+++ b/src/tools/gmx_trjconv.c
@@ -1363,8 +1363,8 @@ int gmx_trjconv(int argc,char *argv[])
                         }
                         /* Copy the input trxframe struct to the output trxframe struct */
                         frout = fr;
-                       frout.bV    &= bVels;
-                       frout.bF    &= bForce;
+                       frout.bV = (frout.bV && bVels);
+                       frout.bF = (frout.bF && bForce);
                         frout.natoms = nout;
                         if (bNeedPrec && (bSetPrec || !fr.bPrec)) {
                             frout.bPrec = TRUE;