From 00dc758fa0e178b0c86cdae5bde47191348106ec Mon Sep 17 00:00:00 2001
From: Berk Hess <hess@kth.se>
Date: Mon, 3 Jun 2013 21:42:21 +0200
Subject: [PATCH] fixed deadlock with replica exchange and -maxh

Fixes #1273

Change-Id: Ib93cce59adf60afe0971944ef41df3a7d9883edc
---
 src/kernel/md.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/kernel/md.c b/src/kernel/md.c
index 0ab2b9313f..4bf12a67d3 100644
--- a/src/kernel/md.c
+++ b/src/kernel/md.c
@@ -979,8 +979,8 @@ double do_md(FILE *fplog, t_commrec *cr, int nfile, const t_filenm fnm[],
         }
 
         /* < 0 means stop at next step, > 0 means stop at next NS step */
-        if ( (gs.set[eglsSTOPCOND] < 0 ) ||
-             ( (gs.set[eglsSTOPCOND] > 0 ) && ( bNS || ir->nstlist == 0)) )
+        if ( (gs.set[eglsSTOPCOND] < 0) ||
+             ( (gs.set[eglsSTOPCOND] > 0) && (bNStList || ir->nstlist == 0) ) )
         {
             bLastStep = TRUE;
         }
-- 
2.22.0