Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / gmxlib / checkpoint.cpp

diff --git a/src/gromacs/gmxlib/checkpoint.cpp b/src/gromacs/gmxlib/checkpoint.cpp
index cf722fcff0d48e57c71ad052615dafd5743cb2c6..438eafba7df1a448ca468cc11332e7a8b9d062f9 100644 (file)
--- a/src/gromacs/gmxlib/checkpoint.cpp
+++ b/src/gromacs/gmxlib/checkpoint.cpp
@@ -2046,13 +2046,13 @@ static void read_checkpoint(const char *fn, FILE **pfplog,
         cp_error();
     }
 
-    ret = do_cpt_swapstate(gmx_fio_getxdr(fp), TRUE, &state->swapstate, NULL);
+    ret = do_cpt_EDstate(gmx_fio_getxdr(fp), TRUE, &state->edsamstate, NULL);
     if (ret)
     {
         cp_error();
     }
 
-    ret = do_cpt_EDstate(gmx_fio_getxdr(fp), TRUE, &state->edsamstate, NULL);
+    ret = do_cpt_swapstate(gmx_fio_getxdr(fp), TRUE, &state->swapstate, NULL);
     if (ret)
     {
         cp_error();