Merge release-4-6 into master

[alexxy/gromacs.git] / src / programs / pdb2gmx / pdb2gmx.c

diff --git a/src/programs/pdb2gmx/pdb2gmx.c b/src/programs/pdb2gmx/pdb2gmx.c
index 9bdf3666a1de51bfb05665b88875e101e7fe3265..18dde119a6eac6b122882330a3124fd9739c881f 100644 (file)
--- a/src/programs/pdb2gmx/pdb2gmx.c
+++ b/src/programs/pdb2gmx/pdb2gmx.c
@@ -267,9 +267,10 @@ static char *search_resrename(int nrr,rtprename_t *rr,
         {
             nn = rr[i].main;
         }
+        
         if (nn[0] == '-')
         {
-            gmx_fatal(FARGS,"In the chosen force field there is no residue type for '%s'%s",name,bStart ? " as a starting terminus" : (bEnd ? " as an ending terminus" : ""));
+            gmx_fatal(FARGS,"In the chosen force field there is no residue type for '%s'%s",name,bStart ? ( bEnd ? " as a standalone (starting & ending) residue" : " as a starting terminus") : (bEnd ? " as an ending terminus" : ""));
         }
     }