Merge release-4-5-patches into release-4-6

Conflicts:
	src/gmxlib/confio.c (whitespace only)

286575f0cd68 commit is not needed and is ignored
by this merge.

Change-Id: I7c4aabd918384aadbf6108501023ca77e019d6c1

diff --git a/src/gmxlib/confio.c b/src/gmxlib/confio.c
index 2c8c2d326f379b1f1eb1abe22cf16066481791f6..ccb5bf64fb4fc1acf763e59f99337e0ff222d0b9 100644 (file)
--- a/src/gmxlib/confio.c
+++ b/src/gmxlib/confio.c
@@ -1739,7 +1739,7 @@ void read_stx_conf(const char *infile, char *title, t_atoms *atoms,
             read_xyz_conf(infile, title, atoms, x);
             break;
         case efG96:
-            fr.title  = title;
+            fr.title  = NULL;
             fr.natoms = atoms->nr;
             fr.atoms  = atoms;
             fr.x      = x;
@@ -1749,6 +1749,7 @@ void read_stx_conf(const char *infile, char *title, t_atoms *atoms,
             read_g96_conf(in, infile, &fr, g96_line);
             gmx_fio_fclose(in);
             copy_mat(fr.box, box);
+            strncpy(title, fr.title, STRLEN);
             break;
         case efPDB:
         case efBRK: