Merge gromacs-4-6 into master

[alexxy/gromacs.git] / src / gromacs / mdlib / edsam.c

diff --git a/src/gromacs/mdlib/edsam.c b/src/gromacs/mdlib/edsam.c
index 9a08468f0c8edbfb16e6bb39d22bd9fdf23d02a8..e7e168aebfaaf42c2a7a6a9c95f29dbdbd103d8f 100644 (file)
--- a/src/gromacs/mdlib/edsam.c
+++ b/src/gromacs/mdlib/edsam.c
@@ -1496,9 +1496,7 @@ static int read_edi(FILE* in, gmx_edsam_t ed,t_edpar *edi,int nr_mdatoms, int ed
     {
         if (readmagic==666 || readmagic==667 || readmagic==668)
             gmx_fatal(FARGS,"Wrong magic number: Use newest version of make_edi to produce edi file");
-        else if (readmagic == 669)
-            ;
-        else
+        else if (readmagic != 669)
             gmx_fatal(FARGS,"Wrong magic number %d in %s",readmagic,ed->edinam);
     }