Testing a GMT_THEME off solution (#4710)

* Testing a GMT_THEME off solution

Goal is to allow suers to override specifics in the theme settings without having the THEME be parsed again and overwrite the changes

* Update gmt_init.c

Author: PaulWessel

src/gmt_init.c

@@ -9643,6 +9643,7 @@ GMT_LOCAL int gmtinit_update_theme (struct GMT_CTRL *GMT) {
 	char theme_file[PATH_MAX] = {""};
 
 	if (!GMT->current.setting.update_theme) return GMT_NOERROR;	/* Nothing to do */
+	if (!strcmp (GMT->current.setting.theme, "off")) return GMT_NOERROR;	/* Nothing to do */
 
 	/* Got a GMT_THEME setting, take delayed action now */
 	GMT->current.setting.update_theme = false;
@@ -11297,9 +11298,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
 		case GMTCASE_GMT_THEME:
 			if (strlen (value) < GMT_LEN64) {
 				strncpy (GMT->current.setting.theme, value, GMT_LEN64-1);
-				GMT->current.setting.update_theme = true;
-				if (core == false)	/* Must deal with this right away */
-					error = gmtinit_update_theme (GMT);
+				GMT->current.setting.update_theme = (strcmp (GMT->current.setting.theme, "off") != 0);
+				error = gmtinit_update_theme (GMT);
 			}
 			else {
 				GMT_Report (GMT->parent, GMT_MSG_ERROR, "GMT_THEME must be less than %d characters\n", GMT_LEN64);

src/gmtset.c

@@ -173,6 +173,8 @@ EXTERN_MSC int GMT_gmtset (void *V_API, int mode, void *args) {
 
 	if (gmt_setdefaults (GMT, options)) Return (GMT_PARSE_ERROR);		/* Process command line arguments, return error if failures */
 
+	strcpy (GMT->current.setting.theme, "off");	/* To preserve changes the user may have set */
+
 	gmt_putdefaults (GMT, Ctrl->G.file);	/* Write out the revised settings */
 
 	Return (GMT_NOERROR);