From 936021d8a6e67a89feeda3b93260142351f368e7 Mon Sep 17 00:00:00 2001
From: Robert Soliday <soliday@anl.gov>
Date: Thu, 4 May 2017 15:20:15 -0500
Subject: [PATCH] Updated to optionally build without replacing the parent
 display when opening a related display no matter what the adl file says

---
 medm/Makefile             | 2 ++
 medm/medmRelatedDisplay.c | 6 ++++--
 medm/medmVersion.h        | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/medm/Makefile b/medm/Makefile
index df3c2c4..d776be1 100644
--- a/medm/Makefile
+++ b/medm/Makefile
@@ -127,6 +127,8 @@ ifdef JPT
 endif
 
 USR_CFLAGS += -DEDITRES
+#A crash can happen on RHEL7 when related displays replace the parent display
+USR_CFLAGS += -DNO_REPLACE_DISPLAY
 
 PROD_HOST = medm
 
diff --git a/medm/medmRelatedDisplay.c b/medm/medmRelatedDisplay.c
index 6a0a5e2..971ddcc 100644
--- a/medm/medmRelatedDisplay.c
+++ b/medm/medmRelatedDisplay.c
@@ -672,8 +672,10 @@ void parseRelatedDisplayEntry(DisplayInfo *displayInfo,
 	    } else if(!strcmp(token,"policy")) {
 		getToken(displayInfo,token);
 		getToken(displayInfo,token);
-		if(!strcmp(token,stringValueTable[REPLACE_DISPLAY]))
-		  relatedDisplay->mode = REPLACE_DISPLAY;
+#if !defined(NO_REPLACE_DISPLAY)
+                if(!strcmp(token,stringValueTable[REPLACE_DISPLAY]))
+                  relatedDisplay->mode = REPLACE_DISPLAY;
+#endif
 	    }
 	    break;
 	case T_LEFT_BRACE:
diff --git a/medm/medmVersion.h b/medm/medmVersion.h
index 4f47aa6..6217c05 100644
--- a/medm/medmVersion.h
+++ b/medm/medmVersion.h
@@ -67,7 +67,7 @@
  */
 #define MEDM_VERSION		3
 #define MEDM_REVISION		1
-#define MEDM_MODIFICATION	11
+#define MEDM_MODIFICATION	12
 #define MEDM_PATCH_LEVEL	0
-#define MEDM_VERSION_STRING	"MEDM Version 3.1.11"
-#define MEDM_VERSION_DIGITS	"MEDM030111"
+#define MEDM_VERSION_STRING	"MEDM Version 3.1.12"
+#define MEDM_VERSION_DIGITS	"MEDM030112"