Ignore classic history when modern session starts (#3851) (#3852)

github-actions[bot] · PaulWessel · web-flow · commit 97bfe88ffa16 · 2020-08-05T21:02:29.000-04:00
See troubles found in #3844. Co-authored-by: Paul Wessel <pwessel@hawaii.edu>
diff --git a/src/gmt_init.c b/src/gmt_init.c
@@ -17516,7 +17516,9 @@ int gmt_manage_workflow (struct GMTAPI_CTRL *API, unsigned int mode, char *text)
 					}
 				}
 			}
-			if (error) return (error);			/* Bail at this point */
+			if (error) return (error);		/* Bail at this point */
+			gmt_reset_history (API->GMT);	/* No old classic history shall affect a new modern mode session */
+
 			gmt_conf (API->GMT);				/* Get the original system defaults */
 			if (!clean_start) gmt_getdefaults (API->GMT, NULL);		/* Overload user defaults */
 			snprintf (dir, PATH_MAX, "%s/%s", API->gwf_dir, GMT_SETTINGS_FILE);	/* Reuse dir string for saving gmt.conf to this dir */

Original file line number	Diff line number	Diff line change
`@@ -17516,7 +17516,9 @@ int gmt_manage_workflow (struct GMTAPI_CTRL API, unsigned int mode, char text)`
`17516`	`17516`	`}`
`17517`	`17517`	`}`
`17518`	`17518`	`}`
`17519`		`- if (error) return (error); /* Bail at this point */`
	`17519`	`+ if (error) return (error); /* Bail at this point */`
	`17520`	`+ gmt_reset_history (API->GMT); /* No old classic history shall affect a new modern mode session */`
	`17521`	`+`
`17520`	`17522`	`gmt_conf (API->GMT); /* Get the original system defaults */`
`17521`	`17523`	`if (!clean_start) gmt_getdefaults (API->GMT, NULL); /* Overload user defaults */`
`17522`	`17524`	`snprintf (dir, PATH_MAX, "%s/%s", API->gwf_dir, GMT_SETTINGS_FILE); /* Reuse dir string for saving gmt.conf to this dir */`